New upstream version 5.4.21upstream/5.4.21

749 files changed, 27931 insertions, 52607 deletions

diff --git a/Makefile.global b/Makefile.global
index b30c318fc..6b79ad7aa 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -10,7 +10,7 @@ all: $(all_targets)
 	@echo "Build complete."
 	@echo "Don't forget to run 'make test'."
 	@echo
-	
+
 build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)
 
 build-binaries: $(PHP_BINARIES)
@@ -116,7 +116,7 @@ clean:
 	rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
 
 distclean: clean
-	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp
+	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak
 	$(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f
 
 .PHONY: all clean install distclean test
diff --git a/NEWS b/NEWS
index c1f94c5e7..98584c47e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,24 +1,353 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+17 Oct 2013, PHP 5.4.21
+
+- Core:
+  . Fixed bug #65322 (compile time errors won't trigger auto loading). (Nikita)
+
+- CLI server:
+  . Fixed bug #65633 (built-in server treat some http headers as
+    case-sensitive). (Adam)
+
+- Datetime:
+  . Fixed bug #64157 (DateTime::createFromFormat() reports confusing error
+    message). (Boro Sitnikovski)
+
+- DBA extension:
+  . Fixed bug #65708 (dba functions cast $key param to string in-place,
+    bypassing copy on write). (Adam)
+
+- Filter:
+  . Add RFC 6598 IPs to reserved addresses. (Sebastian Nohn)
+  . Fixed bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names).
+    (Syra)
+
+- IMAP:
+  . Fixed bug #65721 (configure script broken in 5.5.4 and 5.4.20 when enabling
+    imap). (ryotakatsuki at gmail dot com)
+
+- Standard:
+  . Fixed bug #61548 (content-type must appear at the end of headers for 201 
+    Location to work in http). (Mike)
+
+- Build system:
+  . Fixed bug #62396 ('make test' crashes starting with 5.3.14 (missing 
+    gzencode())). (Mike)
+
+
+19 Sep 2013, PHP 5.4.20
+
+- Core:
+  . Fixed bug #60598 (cli/apache sapi segfault on objects manipulation).
+    (Laruence)
+  . Fixed bug #65579 (Using traits with get_class_methods causes segfault).
+    (Adam)
+  . Fixed bug #65490 (Duplicate calls to get lineno & filename for 
+    DTRACE_FUNCTION_*). (Chris Jones)
+  . Fixed bug #65483 (quoted-printable encode stream filter incorrectly encoding
+    spaces). (Michael M Slusarz)
+  . Fixed bug #65481 (shutdown segfault due to serialize) (Mike)
+  . Fixed bug #65470 (Segmentation fault in zend_error() with 
+    --enable-dtrace). (Chris Jones, Kris Van Hees)
+  . Fixed bug #65372 (Segfault in gc_zval_possible_root when return reference
+    fails). (Laruence)
+  . Fixed bug #65304 (Use of max int in array_sum). (Laruence)
+  . Fixed bug #65291 (get_defined_constants() causes PHP to crash in a very
+    limited case). (Arpad)
+  . Fixed bug #65225 (PHP_BINARY incorrectly set). (Patrick Allaert)
+  . Improved fix for bug #63186 (compile failure on netbsd). (Matteo)
+  . Fixed bug #62692 (PHP fails to build with DTrace). (Chris Jones, Kris Van Hees)
+  . Fixed bug #61759 (class_alias() should accept classes with leading
+    backslashes). (Julien)
+  . Fixed bug #61345 (CGI mode - make install don't work). (Michael Heimpold)
+  . Cherry-picked some DTrace build commits (allowing builds on Linux,
+    bug #62691, and bug #63706) from PHP 5.5 branch
+  . Fixed bug #61268 (--enable-dtrace leads make to clobber
+    Zend/zend_dtrace.d) (Chris Jones)
+
+- cURL:
+  . Fixed bug #65458 (curl memory leak). (Adam)
+
+- Datetime:
+  . Fixed bug #65554 (createFromFormat broken when weekday name is followed 
+    by some delimiters). (Valentin Logvinskiy, Stas).
+  . Fixed bug #65564 (stack-buffer-overflow in DateTimeZone stuff caught
+    by AddressSanitizer). (Remi).
+
+- Openssl:
+  . Fixed bug #64802 (openssl_x509_parse fails to parse subject properly in 
+    some cases). (Mark Jones)
+
+- Session:
+  . Fixed bug #62129 (rfc1867 crashes php even though turned off). (gxd305 at
+    gmail dot com)
+  . Fixed bug #50308 (session id not appended properly for empty anchor tags).
+    (Arpad)
+  . Fixed possible buffer overflow under Windows. Note: Not a security fix.
+    (Yasuo)
+  . Changed session.auto_start to PHP_INI_PERDIR. (Yasuo)
+
+- SOAP:
+  . Fixed bug #65018 (SoapHeader problems with SoapServer). (Dmitry)
+
+- SPL:
+  . Fixed bug #65328 (Segfault when getting SplStack object Value). (Laruence)
+
+- PDO:
+  . Fixed bug #64953 (Postgres prepared statement positional parameter 
+    casting). (Mike)
+
+- Phar:
+  . Fixed bug #65028 (Phar::buildFromDirectory creates corrupt archives for 
+    some specific contents). (Stas)
+
+- Pgsql:
+  . Fixed bug #65336 (pg_escape_literal/identifier() silently returns false).
+    (Yasuo)
+  . Fixed bug #62978 (Disallow possible SQL injections with pg_select()/pg_update()
+    /pg_delete()/pg_insert()). (Yasuo)
+
+- Zlib:
+  . Fixed bug #65391 (Unable to send vary header user-agent when 
+    ob_start('ob_gzhandler') is called) (Mike)
+
+22 Aug 2013, PHP 5.4.19
+
+- Core:
+  . Fixed bug #64503 (Compilation fails with error: conflicting types for
+    'zendparse'). (Laruence)
+
+- Openssl:
+  . Fixed UMR in fix for CVE-2013-4248.
+
+15 Aug 2013, PHP 5.4.18
+
+- Core:
+  . Fixed value of FILTER_SANITIZE_FULL_SPECIAL_CHARS constant (previously was
+    erroneously set to FILTER_SANITIZE_SPECIAL_CHARS value). (Andrey 
+    avp200681 gmail com).
+  . Fixed bug #65254 (Exception not catchable when exception thrown in autoload
+    with a namespace). (Laruence)
+  . Fixed bug #65108 (is_callable() triggers Fatal Error). 
+    (David Soria Parra, Laruence)
+  . Fixed bug #65088 (Generated configure script is malformed on OpenBSD).
+    (Adam)
+  . Fixed bug #62964 (Possible XSS on "Registered stream filters" info).
+    (david at nnucomputerwhiz dot com)
+  . Fixed bug #62672 (Error on serialize of ArrayObject). (Lior Kaplan)
+  . Fixed bug #62475 (variant_* functions causes crash when null given as an 
+    argument). (Felipe)
+  . Fixed bug #60732 (php_error_docref links to invalid pages). (Jakub Vrana)
+  . Fixed bug #65226 (chroot() does not get enabled). (Anatol)
+
+- CGI:
+  . Fixed Bug #65143 (Missing php-cgi man page). (Remi)
+
+- CLI server:
+  . Fixed bug #65066 (Cli server not responsive when responding with 422 http
+    status code). (Adam)
+    
+- CURL:
+  . Fixed bug #62665 (curl.cainfo doesn't appear in php.ini). (Lior Kaplan)
+
+- FPM:
+  . Fixed bug #63983 (enabling FPM borks compile on FreeBSD).
+    (chibisuke at web dot de, Felipe)
+    
+- FTP:
+  . Fixed bug #65228 (FTPs memory leak with SSL).
+    (marco dot beierer at mbsecurity dot ch)
+    
+- GMP:
+  . Fixed bug #65227 (Memory leak in gmp_cmp second parameter). (Felipe)
+
+- Imap:
+  . Fixed bug #64467 (Segmentation fault after imap_reopen failure).
+    (askalski at gmail dot com)
+
+- Intl: 
+  . Fixed bug #62759 (Buggy grapheme_substr() on edge case). (Stas)
+  . Fixed bug #61860 (Offsets may be wrong for grapheme_stri* functions).
+    (Stas)
+
+- mysqlnd: 
+  . Fixed segfault in mysqlnd when doing long prepare. (Andrey)
+  
+- ODBC:
+  . Fixed bug #61387 (NULL valued anonymous column causes segfault in 
+    odbc_fetch_array). (Brandon Kirsch)
+
+- Openssl:
+  . Fixed handling null bytes in subjectAltName (CVE-2013-4248).
+    (Christian Heimes)
+
+- PDO:
+  . Allowed PDO_OCI to compile with Oracle Database 12c client libraries.
+    (Chris Jones)
+
+- PDO_dblib:
+  . Fixed bug #65219 (PDO/dblib not working anymore ("use dbName" not sent)). 
+    (Stanley Sufficool)
+
+- PDO_pgsql:
+  . Fixed meta data retrieve when OID is larger than 2^31. (Yasuo)
+
+- Phar:
+  . Fixed Bug #65142 (Missing phar man page). (Remi)
+
+- Session
+  . Fixed bug #62535 ($_SESSION[$key]["cancel_upload"] doesn't work as
+    documented). (Arpad)
+  . Fixed bug #35703 (when session_name("123") consist only digits, 
+    should warning). (Yasuo)
+  . Fixed bug #49175 (mod_files.sh does not support hash bits). Patch by
+    oorza2k5 at gmail dot com (Yasuo)
+
+- Sockets:
+  . Implemented FR #63472 (Setting SO_BINDTODEVICE with socket_set_option). 
+    (Damjan Cvetko)
+
+- SPL:
+  . Fixed bug #65136 (RecursiveDirectoryIterator segfault). (Laruence)
+  . Fixed bug #61828 (Memleak when calling Directory(Recursive)Iterator
+    /Spl(Temp)FileObject ctor twice). (Laruence)
+  . Fixed bug #60560 (SplFixedArray un-/serialize, getSize(), count() return 0,
+    keys are strings). (Adam)
+
+- XML:
+  . Fixed bug #65236 (heap corruption in xml parser, CVE-2013-4113). (Rob)
+
+04 Jul 2013, PHP 5.4.17
+
+- Core:
+  . Fixed bug #64988 (Class loading order affects E_STRICT warning). (Laruence)
+  . Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC). (Laruence)
+  . Fixed bug #64960 (Segfault in gc_zval_possible_root). (Laruence)
+  . Fixed bug #64936 (doc comments picked up from previous scanner run). (Stas,
+    Jonathan Oddy)
+  . Fixed bug #64934 (Apache2 TS crash with get_browser()). (Anatol)
+  . Fixed bug #64166 (quoted-printable-encode stream filter incorrectly 
+    discarding whitespace). (Michael M Slusarz)
+
+- DateTime:
+  . Fixed bug #53437 (Crash when using unserialized DatePeriod instance).
+    (Gustavo, Derick, Anatol)
+
+- FPM:
+  . Fixed Bug #64915 (error_log ignored when daemonize=0). (Remi)
+  . Implemented FR #64764 (add support for FPM init.d script). (Lior Kaplan)
+
+- PDO:
+  . Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to 
+    the same db server). (Laruence)
+
+- PDO_DBlib:
+  . Fixed bug #63638 (Cannot connect to SQL Server 2008 with PDO dblib). 
+    (Stanley Sufficool)
+  . Fixed bug #64338 (pdo_dblib can't connect to Azure SQL). (Stanley 
+    Sufficool)
+  . Fixed bug #64808 (FreeTDS PDO getColumnMeta on a prepared but not executed 
+    statement crashes). (Stanley Sufficool)
+
+- PDO_firebird:
+  . Fixed bug #64037 (Firebird return wrong value for numeric field).
+    (Matheus Degiovani, Matteo)
+  . Fixed bug #62024 (Cannot insert second row with null using parametrized
+    query). (patch by james@kenjim.com, Matheus Degiovani, Matteo)
+
+- PDO_mysql:
+  . Fixed bug #48724 (getColumnMeta() doesn't return native_type for BIT, 
+    TINYINT and YEAR). (Antony, Daniel Beardsley)
+
+- PDO_pgsql:
+  . Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error). (Remi)
+
+- pgsql:
+  . Fixed bug #64609 (pg_convert enum type support). (Matteo)
+  . Fixed bug #65015 (pg_send_query does not flush send buffer)
+       patch submitted by: adam at vektah dot net (Yasuo)
+
+- Readline:
+  . Implement FR #55694 (Expose additional readline variable to prevent 
+    default filename completion). (Hartmel)
+
+- SPL:
+  . Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on
+    64-bits systems). (Laruence)
+
+06 Jun 2013, PHP 5.4.16
+
+- Core:
+  . Fixed bug #64879 (Heap based buffer overflow in quoted_printable_encode,
+    CVE 2013-2110). (Stas)
+  . Fixed bug #64853 (Use of no longer available ini directives causes crash on
+    TS build). (Anatol)
+  . Fixed bug #64729 (compilation failure on x32). (Gustavo)
+  . Fixed bug #64720 (SegFault on zend_deactivate). (Dmitry)
+  . Fixed bug #64660 (Segfault on memory exhaustion within function definition).
+    (Stas, reported by Juha Kylmänen)
+
+- Calendar:
+  . Fixed bug #64895 (Integer overflow in SndToJewish). (Remi)
+
+- Fileinfo:
+  . Fixed bug #64830 (mimetype detection segfaults on mp3 file). (Anatol)
+
+- FPM:
+  . Ignore QUERY_STRING when sent in SCRIPT_FILENAME. (Remi)
+  . Fixed some possible memory or resource leaks and possible null dereference
+    detected by code coverity scan. (Remi)
+  . Log a warning when a syscall fails. (Remi)
+  . Add --with-fpm-systemd option to report health to systemd, and
+    systemd_interval option to configure this. The service can now use
+    Type=notify in the systemd unit file. (Remi)
+
+- MySQLi
+  . Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB
+    pointer has closed). (Laruence)
+
+- Phar
+  . Fixed bug #64214 (PHAR PHPTs intermittently crash when run on DFS, SMB or 
+    with non std tmp dir). (Pierre)
+
+- SNMP:
+  . Fixed bug #64765 (Some IPv6 addresses get interpreted wrong).
+    (Boris Lytochkin)
+  . Fixed bug #64159 (Truncated snmpget). (Boris Lytochkin)
+
+- Streams:
+  . Fixed bug #64770 (stream_select() fails with pipes returned by proc_open()
+    on Windows x64). (Anatol)
+
+- Zend Engine:
+  . Fixed bug #64821 (Custom Exceptions crash when internal properties 
+    overridden). (Anatol)
+
 09 May 2013, PHP 5.4.15
 - Core:
-  . Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: 
+  . Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap:
     segfault). (Laruence)
   . Fixed bug #64458 (dns_get_record result with string of length -1). (Stas)
-  . Fixed bug #64433 (follow_location parameter of context is ignored for most 
+  . Fixed bug #64433 (follow_location parameter of context is ignored for most
     response codes). (Sergey Akbarov)
   . Fixed bugs #47675 and #64577 (fd leak on Solaris)
 
 - Fileinfo:
   . Upgraded libmagic to 5.14. (Anatol)
 
+- MySQLi:
+  . Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB
+    pointer has closed). (Laruence)
+
 - Zip:
   . Fixed bug #64342 (ZipArchive::addFile() has to check for file existence).
     (Anatol)
 
 - Streams:
-  . Fixed Windows x64 version of stream_socket_pair() and improved error handling
-    (Anatol Belski)
+  . Fixed Windows x64 version of stream_socket_pair() and improved error
+    handling. (Anatol Belski)
+  . Fixed bug #64770 (stream_select() fails with pipes returned by proc_open()
+    on Windows x64). (Anatol)
 
 11 Apr 2013, PHP 5.4.14
 
@@ -56,7 +385,7 @@ PHP                                                                        NEWS
     be autoloaded fail). (Laruence)
   . Fixed bug #64235 (Insteadof not work for class method in 5.4.11).
     (Laruence)
-  . Fixed bug #64197 (_Offsetof() macro used but not defined on ARM/Clang). 
+  . Fixed bug #64197 (_Offsetof() macro used but not defined on ARM/Clang).
     (Ard Biesheuvel)
   . Implemented FR #64175 (Added HTTP codes as of RFC 6585). (Jonh Wendell)
   . Fixed bug #64142 (dval to lval different behavior on ppc64). (Remi)
@@ -75,7 +404,7 @@ PHP                                                                        NEWS
 - OpenSSL:
   . New SSL stream context option to prevent CRIME attack vector. (Daniel Lowrey,
 	Lars)
-  . Fixed bug #61930 (openssl corrupts ssl key resource when using 
+  . Fixed bug #61930 (openssl corrupts ssl key resource when using
     openssl_get_publickey()). (Stas)
 
 - PDO_mysql:
@@ -88,17 +417,14 @@ PHP                                                                        NEWS
 - SOAP
   . Added check that soap.wsdl_cache_dir conforms to open_basedir
     (CVE-2013-1635). (Dmitry)
-  . Disabled external entities loading (CVE-2013-1643, CVE-2013-1824). 
+  . Disabled external entities loading (CVE-2013-1643, CVE-2013-1824).
     (Dmitry)
 
-- Phar:
-  . Fixed timestamp update on Phar contents modification. (Dmitry)
-
 - SPL:
   . Fixed bug #64264 (SPLFixedArray toArray problem). (Laruence)
   . Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS).
     (patch by kriss@krizalys.com, Laruence)
-  . Fixed bug #64106 (Segfault on SplFixedArray[][x] = y when extended). 
+  . Fixed bug #64106 (Segfault on SplFixedArray[][x] = y when extended).
     (Nikita Popov)
   . Fixed bug #52861 (unset fails with ArrayObject and deep arrays).
     (Mike Willbanks)
@@ -120,16 +446,16 @@ PHP                                                                        NEWS
   . Fixed bug #63893 (Poor efficiency of strtr() using array with keys of very
     different length). (Gustavo)
   . Fixed bug #63882 (zend_std_compare_objects crash on recursion). (Dmitry)
-  . Fixed bug #63462 (Magic methods called twice for unset protected 
+  . Fixed bug #63462 (Magic methods called twice for unset protected
     properties). (Stas)
-  . Fixed bug #62524 (fopen follows redirects for non-3xx statuses). 
-    (Wes Mason) 
+  . Fixed bug #62524 (fopen follows redirects for non-3xx statuses).
+    (Wes Mason)
   . Support BITMAPV5HEADER in getimagesize(). (AsamK, Lars)
 
 - Date:
   . Fixed bug #63699 (Performance improvements for various ext/date functions).
     (Lars, original patch by njaguar at gmail dot com)
-  . Fixed bug #55397: Comparsion of incomplete DateTime causes SIGSEGV. 
+  . Fixed bug #55397: Comparsion of incomplete DateTime causes SIGSEGV.
     (Derick)
 
 - FPM:
@@ -253,7 +579,7 @@ PHP                                                                        NEWS
     (Tony, Andrew Sitnikov)
   . Fixed bug #63241 (PHP fails to open Windows deduplicated files).
     (daniel dot stelter-gliese at innogames dot de)
-  . Fixed bug #62444 (Handle leak in is_readable on windows). 
+  . Fixed bug #62444 (Handle leak in is_readable on windows).
     (krazyest at seznam dot cz)
 
 - Curl:
@@ -305,7 +631,7 @@ PHP                                                                        NEWS
 18 Oct 2012, PHP 5.4.8
 
 - CLI server:
-  . Implemented FR #63242 (Default error page in PHP built-in web server uses 
+  . Implemented FR #63242 (Default error page in PHP built-in web server uses
     outdated html/css). (pascal.chevrel@free.fr)
   . Changed response to unknown HTTP method to 501 according to RFC.
     (Niklas Lindgren).
@@ -325,7 +651,7 @@ PHP                                                                        NEWS
     (Laruence)
   . Fixed bug #62976 (Notice: could not be converted to int when comparing
     some builtin classes). (Laruence)
-  . Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" 
+  . Fixed bug #62955 (Only one directive is loaded from "Per Directory Values"
     Windows registry). (aserbulov at parallels dot com)
   . Fixed bug #62907 (Double free when use traits). (Dmitry)
   . Fixed bug #61767 (Shutdown functions not called in certain error
@@ -359,7 +685,7 @@ PHP                                                                        NEWS
   . Fixed bug #60901 (Improve "tail" syntax for AIX installation) (Chris Jones)
 
 - OpenSSL:
-  . Implemented FR #61421 (OpenSSL signature verification missing RMD160, 
+  . Implemented FR #61421 (OpenSSL signature verification missing RMD160,
     SHA224, SHA256, SHA384, SHA512). (Mark Jones)
 
 - PDO:
@@ -367,7 +693,7 @@ PHP                                                                        NEWS
     DBQUOTEDIDENT, 1)). (Laruence)
   . Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec).
     (Martin Osvald, Remi)
-    
+
 - PDO Firebird:
   . Fixed bug #63214 (Large PDO Firebird Queries).
     (james at kenjim dot com)
@@ -377,7 +703,7 @@ PHP                                                                        NEWS
     (Dmitry)
 
 - SPL:
-  . Bug #62987 (Assigning to ArrayObject[null][something] overrides all 
+  . Bug #62987 (Assigning to ArrayObject[null][something] overrides all
     undefined variables). (Laruence)
 
 - mbstring:
@@ -397,7 +723,7 @@ PHP                                                                        NEWS
 - Core:
   . Fixed bug (segfault while build with zts and GOTO vm-kind). (Laruence)
   . Fixed bug #62844 (parse_url() does not recognize //). (Andrew Faulds).
-  . Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not 
+  . Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not
     set). (Felipe)
   . Fixed bug #62763 (register_shutdown_function and extending class).
     (Laruence)
@@ -409,9 +735,9 @@ PHP                                                                        NEWS
   . Fixed bug #62358 (Segfault when using traits a lot). (Laruence)
   . Fixed bug #62328 (implementing __toString and a cast to string fails)
     (Laruence)
-  . Fixed bug #51363 (Fatal error raised by var_export() not caught by error 
+  . Fixed bug #51363 (Fatal error raised by var_export() not caught by error
     handler). (Lonny Kapelushnik)
-  . Fixed bug #40459 (Stat and Dir stream wrapper methods do not call 
+  . Fixed bug #40459 (Stat and Dir stream wrapper methods do not call
     constructor). (Stas)
 
 - CURL:
@@ -428,21 +754,21 @@ PHP                                                                        NEWS
   . Fixed bug #62460 (php binaries installed as binary.dSYM). (Reeze Xia)
 
 - PCRE:
-  . Fixed bug #55856 (preg_replace should fail on trailing garbage). 
+  . Fixed bug #55856 (preg_replace should fail on trailing garbage).
     (reg dot php at alf dot nu)
 
 - PDO:
   . Fixed bug #62685 (Wrong return datatype in PDO::inTransaction()). (Laruence)
 
 - Reflection:
-  . Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on importing 
+  . Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on importing
     trait methods as private). (Felipe)
   . Fixed bug #62715 (ReflectionParameter::isDefaultValueAvailable() wrong
     result). (Laruence)
 
 - Session:
   . Fixed bug (segfault due to retval is not initialized). (Laruence)
-  . Fixed bug (segfault due to PS(mod_user_implemented) not be reseted 
+  . Fixed bug (segfault due to PS(mod_user_implemented) not be reseted
     when close handler call exit). (Laruence)
 
 - SOAP
@@ -465,7 +791,7 @@ PHP                                                                        NEWS
 16 Aug 2012, PHP 5.4.6
 
 - CLI Server:
-  . Implemented FR #62700 (have the console output 'Listening on 
+  . Implemented FR #62700 (have the console output 'Listening on
     http://localhost:8000'). (pascal.chevrel@free.fr)
 
 - Core:
@@ -484,13 +810,13 @@ PHP                                                                        NEWS
 
 - DateTime:
   . Fixed Bug #62500 (Segfault in DateInterval class when extended). (Laruence)
-  
+
 - Fileinfo:
-  . Fixed bug #61964 (finfo_open with directory causes invalid free). 
+  . Fixed bug #61964 (finfo_open with directory causes invalid free).
     (reeze.xia@gmail.com)
 
 - Intl:
-  . Fixed bug #62564 (Extending MessageFormatter and adding property causes 
+  . Fixed bug #62564 (Extending MessageFormatter and adding property causes
     crash). (Felipe)
 
 - MySQLnd:
@@ -501,16 +827,16 @@ PHP                                                                        NEWS
     sapi/cli/cli.h: No such file). (Johannes)
 
 - Reflection:
-  . Implemented FR #61602 (Allow access to name of constant used as default 
+  . Implemented FR #61602 (Allow access to name of constant used as default
     value). (reeze.xia@gmail.com)
-  
+
 - SimpleXML:
   . Implemented FR #55218 Get namespaces from current node. (Lonny)
 
 - SPL:
   . Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance
     gives Segmentation fault). (Laruence, Gustavo)
-  . Fixed bug #61527 (ArrayIterator gives misleading notice on next() when 
+  . Fixed bug #61527 (ArrayIterator gives misleading notice on next() when
     moved to the end). (reeze.xia@gmail.com)
 
 - Streams:
@@ -524,7 +850,7 @@ PHP                                                                        NEWS
 19 Jul 2012, PHP 5.4.5
 
 - Core:
-  . Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed 
+  . Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed
     Salt). (Anthony Ferrara)
   . Fixed bug #62432 (ReflectionMethod random corrupt memory on high
     concurrent). (Johannes)
@@ -536,11 +862,11 @@ PHP                                                                        NEWS
     crash during execution). (Dmitry)
   . Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that
     includes a semi-colon). (Pierrick)
-  . Fixed potential overflow in _php_stream_scandir (CVE-2012-2688). 
+  . Fixed potential overflow in _php_stream_scandir (CVE-2012-2688).
     (Jason Powell, Stas)
 
 - EXIF:
-  . Fixed information leak in ext exif (discovered by Martin Noga, 
+  . Fixed information leak in ext exif (discovered by Martin Noga,
     Matthew "j00ru" Jurczyk, Gynvael Coldwind)
 
 - FPM:
@@ -588,9 +914,9 @@ PHP                                                                        NEWS
     return a value). (Johannes)
 
 - Reflection:
-  . Fixed bug #62384 (Attempting to invoke a Closure more than once causes 
+  . Fixed bug #62384 (Attempting to invoke a Closure more than once causes
     segfault). (Felipe)
-  . Fixed bug #62202 (ReflectionParameter::getDefaultValue() memory leaks 
+  . Fixed bug #62202 (ReflectionParameter::getDefaultValue() memory leaks
     with constant). (Laruence)
 
 - Sockets:
@@ -603,7 +929,7 @@ PHP                                                                        NEWS
     (Nikita Popov)
 
 - XML Writer:
-  . Fixed bug #62064 (memory leak in the XML Writer module). 
+  . Fixed bug #62064 (memory leak in the XML Writer module).
     (jean-pierre dot lozi at lip6 dot fr)
 
 - Zip:
@@ -615,19 +941,19 @@ PHP                                                                        NEWS
   . Fixed bug #62146 com_dotnet cannot be built shared. (Johannes)
 
 - CLI Server:
-  . Implemented FR #61977 (Need CLI web-server support for files with .htm & 
+  . Implemented FR #61977 (Need CLI web-server support for files with .htm &
     svg extensions). (Sixd, Laruence)
   . Improved performance while sending error page, this also fixed
     bug #61785 (Memory leak when access a non-exists file without router).
     (Laruence)
-  . Fixed bug #61546 (functions related to current script failed when chdir() 
+  . Fixed bug #61546 (functions related to current script failed when chdir()
     in cli sapi). (Laruence, reeze.xia@gmail.com)
 
 - Core:
   . Fixed missing bound check in iptcparse(). (chris at chiappa.net)
   . Fixed CVE-2012-2143. (Solar Designer)
   . Fixed bug #62097 (fix for for bug #54547). (Gustavo)
-  . Fixed bug #62005 (unexpected behavior when incrementally assigning to a 
+  . Fixed bug #62005 (unexpected behavior when incrementally assigning to a
     member of a null object). (Laruence)
   . Fixed bug #61978 (Object recursion not detected for classes that implement
     JsonSerializable). (Felipe)
@@ -638,11 +964,11 @@ PHP                                                                        NEWS
   . Fixed bug #61782 (__clone/__destruct do not match other methods when checking
     access controls). (Stas)
   . Fixed bug #61764 ('I' unpacks n as signed if n > 2^31-1 on LP64). (Gustavo)
-  . Fixed bug #61761 ('Overriding' a private static method with a different 
+  . Fixed bug #61761 ('Overriding' a private static method with a different
     signature causes crash). (Laruence)
   . Fixed bug #61730 (Segfault from array_walk modifying an array passed by
     reference). (Laruence)
-  . Fixed bug #61728 (PHP crash when calling ob_start in request_shutdown 
+  . Fixed bug #61728 (PHP crash when calling ob_start in request_shutdown
     phase). (Laruence)
   . Fixed bug #61713 (Logic error in charset detection for htmlentities).
     (Anatoliy)
@@ -660,7 +986,7 @@ PHP                                                                        NEWS
     (Laruence)
 
 - Fileinfo
-  . Fixed bug #61812 (Uninitialised value used in libmagic). 
+  . Fixed bug #61812 (Uninitialised value used in libmagic).
     (Laruence, Gustavo)
   . Fixed bug #61566 failure caused by the posix lseek and read versions
     under windows in cdf_read(). (Anatoliy)
@@ -668,7 +994,7 @@ PHP                                                                        NEWS
     directory descriptor under windows. (Anatoliy)
 
 - Intl
-  . Fixed bug #62082 (Memory corruption in internal function 
+  . Fixed bug #62082 (Memory corruption in internal function
     get_icu_disp_value_src_php()). (Gustavo)
 
 - Libxml:
@@ -690,7 +1016,7 @@ PHP                                                                        NEWS
     maxlen set). (Reeze)
 
 - Zlib:
-  . Fixed bug #61820 (using ob_gzhandler will complain about headers already 
+  . Fixed bug #61820 (using ob_gzhandler will complain about headers already
     sent when no compression). (Mike)
   . Fixed bug #61443 (can't change zlib.output_compression on the fly). (Mike)
   . Fixed bug #60761 (zlib.output_compression fails on refresh). (Mike)
@@ -701,7 +1027,7 @@ PHP                                                                        NEWS
   . Re-Fix PHP-CGI query string parameter vulnerability, CVE-2012-1823.
     (Stas)
   . Fix bug #61807 - Buffer Overflow in apache_request_headers.
-    (nyt-php at countercultured dot net). 
+    (nyt-php at countercultured dot net).
 
 03 May 2012, PHP 5.4.2
 
@@ -711,7 +1037,7 @@ PHP                                                                        NEWS
 
 - CLI Server:
   . Fixed bug #61461 (missing checks around malloc() calls). (Ilia)
-  . Implemented FR #60850 (Built in web server does not set 
+  . Implemented FR #60850 (Built in web server does not set
     $_SERVER['SCRIPT_FILENAME'] when using router). (Laruence)
   . "Connection: close" instead of "Connection: closed" (Gustavo)
 
@@ -719,7 +1045,7 @@ PHP                                                                        NEWS
   . Fixed crash in ZTS using same class in many threads. (Johannes)
   . Fixed bug #61374 (html_entity_decode tries to decode code points that don't
     exist in ISO-8859-1). (Gustavo)
-  . Fixed bug #61273 (call_user_func_array with more than 16333 arguments 
+  . Fixed bug #61273 (call_user_func_array with more than 16333 arguments
     leaks / crashes). (Laruence)
   . Fixed bug #61225 (Incorrect lexing of 0b00*+<NUM>). (Pierrick)
   . Fixed bug #61165 (Segfault - strip_tags()). (Laruence)
@@ -734,7 +1060,7 @@ PHP                                                                        NEWS
   . Fixed bug #61052 (Missing error check in trait 'insteadof' clause). (Stefan)
   . Fixed bug #61011 (Crash when an exception is thrown by __autoload
     accessing a static property). (Laruence)
-  . Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical 
+  . Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical
     vars). (Laruence)
   . Fixed bug #60978 (exit code incorrect). (Laruence)
   . Fixed bug #60911 (Confusing error message when extending traits). (Stefan)
@@ -778,7 +1104,7 @@ PHP                                                                        NEWS
     (Johannes)
 
 - PDO
-  . Fixed bug #61292 (Segfault while calling a method on an overloaded PDO 
+  . Fixed bug #61292 (Segfault while calling a method on an overloaded PDO
     object). (Laruence)
 
 - PDO_mysql
@@ -801,18 +1127,18 @@ PHP                                                                        NEWS
 - Reflection:
   . Implemented FR #61602 (Allow access to the name of constant
     used as function/method parameter's default value). (reeze.xia@gmail.com)
-  . Fixed bug #60968 (Late static binding doesn't work with 
+  . Fixed bug #60968 (Late static binding doesn't work with
     ReflectionMethod::invokeArgs()). (Laruence)
 
 - Session
-  . Fixed bug #60634 (Segmentation fault when trying to die() in 
+  . Fixed bug #60634 (Segmentation fault when trying to die() in
     SessionHandler::write()). (Ilia)
 
 - SOAP
   . Fixed bug #61423 (gzip compression fails). (Ilia)
   . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
     User-Agent header). (carloschilazo at gmail dot com)
-  . Fixed bug #60842, #51775 (Chunked response parsing error when 
+  . Fixed bug #60842, #51775 (Chunked response parsing error when
     chunksize length line is > 10 bytes). (Ilia)
   . Fixed bug #49853 (Soap Client stream context header option ignored).
     (Dmitry)
@@ -841,7 +1167,7 @@ PHP                                                                        NEWS
   . Fixed bug #61287 (A particular string fails to decompress). (Mike)
   . Fixed bug #61139 (gzopen leaks when specifying invalid mode). (Nikita Popov)
 
-01 Mar 2012, PHP 5.4.0 
+01 Mar 2012, PHP 5.4.0
 
 - Installation:
   . autoconf 2.59+ is now supported (and required) for generating the
@@ -897,7 +1223,7 @@ PHP                                                                        NEWS
   . Added class member access on instantiation (e.g. (new foo)->bar()) support.
     (Felipe)
   . <?= is now always available regardless of the short_open_tag setting. (Rasmus)
-  . Implemented Zend Signal Handling (configurable option --enable-zend-signals, 
+  . Implemented Zend Signal Handling (configurable option --enable-zend-signals,
     off by default). (Lucas Nealan, Arnaud Le Blanc, Brian Shire, Ilia)
   . Improved output layer, see README.NEW-OUTPUT-API for internals. (Mike)
   . Improved UNIX build system to allow building multiple PHP binary SAPIs and
@@ -905,7 +1231,7 @@ PHP                                                                        NEWS
   . Implemented closure rebinding as parameter to bindTo. (Gustavo Lopes)
   . Improved the warning message of incompatible arguments. (Laruence)
   . Improved ternary operator performance when returning arrays. (Arnaud, Dmitry)
-  . Changed error handlers to only generate docref links when the docref_root 
+  . Changed error handlers to only generate docref links when the docref_root
     php.ini setting is not empty. (Derick)
   . Changed silent conversion of array to string to produce a notice. (Patrick)
   . Changed default encoding from ISO-8859-1 to UTF-8 when not specified in
@@ -1048,8 +1374,8 @@ PHP                                                                        NEWS
   . Fixed bug #52211 (iconv() returns part of string on error). (Felipe)
   . Fixed bug #51860 (Include fails with toplevel symlink to /). (Dmitry)
 
-- Improved generic SAPI support: 
-  . Added $_SERVER['REQUEST_TIME_FLOAT'] to include microsecond precision. 
+- Improved generic SAPI support:
+  . Added $_SERVER['REQUEST_TIME_FLOAT'] to include microsecond precision.
     (Patrick)
   . Added header_register_callback() which is invoked immediately
     prior to the sending of headers and after default headers have
@@ -1057,11 +1383,11 @@ PHP                                                                        NEWS
   . Added http_response_code() function. FR #52555. (Paul Dragoonis, Kalle)
   . Fixed bug #55500 (Corrupted $_FILES indices lead to security concern).
     (CVE-2012-1172). (Stas)
-  . Fixed bug #54374 (Insufficient validating of upload name leading to 
+  . Fixed bug #54374 (Insufficient validating of upload name leading to
     corrupted $_FILES indices). (CVE-2012-1172). (Stas, lekensteyn at gmail dot com)
 
 - Improved CLI SAPI:
-  . Added built-in web server that is intended for testing purpose. 
+  . Added built-in web server that is intended for testing purpose.
     (Moriyoshi, Laruence, and fixes by Pierre, Derick, Arpad,
     chobieee at gmail dot com)
   . Added command line option --rz <name> which shows information of the
@@ -1113,7 +1439,7 @@ PHP                                                                        NEWS
 - Improved intl extension:
   . Added Spoofchecker class, allows checking for visibly confusable characters and
     other security issues. (Scott)
-  . Added Transliterator class, allowing transliteration of strings. 
+  . Added Transliterator class, allowing transliteration of strings.
     (Gustavo)
   . Added support for UTS #46. (Gustavo)
   . Fixed build on Fedora 15 / Ubuntu 11. (Hannes)
@@ -1155,9 +1481,9 @@ PHP                                                                        NEWS
   . PDO_mysql: Removed support for linking with MySQL client libraries older
     than 4.1. (Johannes)
   . ext/mysql, mysqli and pdo_mysql now use mysqlnd by default. (Johannes)
-  . Fixed bug #55473 (mysql_pconnect leaks file descriptors on reconnect). 
+  . Fixed bug #55473 (mysql_pconnect leaks file descriptors on reconnect).
     (Andrey, Laruence)
-  . Fixed bug #55653 (PS crash with libmysql when binding same variable as 
+  . Fixed bug #55653 (PS crash with libmysql when binding same variable as
     param and out). (Laruence)
 
 - Improved OpenSSL extension:
@@ -1276,7 +1602,7 @@ PHP                                                                        NEWS
 14 Jun 2012, PHP 5.3.14
 
 - CLI SAPI:
-  . Fixed bug #61546 (functions related to current script failed when chdir() 
+  . Fixed bug #61546 (functions related to current script failed when chdir()
     in cli sapi). (Laruence, reeze.xia@gmail.com)
 
 - CURL:
@@ -1291,7 +1617,7 @@ PHP                                                                        NEWS
   . Fixed missing bound check in iptcparse(). (chris at chiappa.net)
   . Fixed bug #62373 (serialize() generates wrong reference to the object).
     (Moriyoshi)
-  . Fixed bug #62005 (unexpected behavior when incrementally assigning to a 
+  . Fixed bug #62005 (unexpected behavior when incrementally assigning to a
     member of a null object). (Laruence)
   . Fixed bug #61991 (long overflow in realpath_cache_get()). (Anatoliy)
   . Fixed bug #61764 ('I' unpacks n as signed if n > 2^31-1 on LP64). (Gustavo)
@@ -1304,7 +1630,7 @@ PHP                                                                        NEWS
   . Changed php://fd to be available only for CLI.
 
 - Fileinfo:
-  . Fixed bug #61812 (Uninitialised value used in libmagic). 
+  . Fixed bug #61812 (Uninitialised value used in libmagic).
     (Laruence, Gustavo)
 
 - Iconv extension:
@@ -1371,7 +1697,7 @@ PHP                                                                        NEWS
   . Fixed bug #60227 (header() cannot detect the multi-line header with CR).
     (rui, Gustavo)
   . Fixed bug #60222 (time_nanosleep() does validate input params). (Ilia)
-  . Fixed bug #54374 (Insufficient validating of upload name leading to 
+  . Fixed bug #54374 (Insufficient validating of upload name leading to
     corrupted $_FILES indices). (CVE-2012-1172). (Stas, lekensteyn at
     gmail dot com, Pierre)
   . Fixed bug #52719 (array_walk_recursive crashes if third param of the
@@ -1401,7 +1727,7 @@ PHP                                                                        NEWS
 - Libxml:
   . Fixed bug #61617 (Libxml tests failed(ht is already destroyed)).
     (Laruence)
-  . Fixed bug #61367 (open_basedir bypass using libxml RSHUTDOWN). 
+  . Fixed bug #61367 (open_basedir bypass using libxml RSHUTDOWN).
     (Tim Starling)
 
 - mysqli
@@ -1413,7 +1739,7 @@ PHP                                                                        NEWS
   . Fixed bug #61194 (PDO should export compression flag with myslqnd).
     (Johannes)
 
-- PDO_odbc 
+- PDO_odbc
   . Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO). (Ilia)
 
 - PDO_pgsql
@@ -1440,14 +1766,14 @@ PHP                                                                        NEWS
   . Fixed bug #61388 (ReflectionObject:getProperties() issues invalid reads
     when get_properties returns a hash table with (inaccessible) dynamic
     numeric properties). (Gustavo)
-  . Fixed bug #60968 (Late static binding doesn't work with 
+  . Fixed bug #60968 (Late static binding doesn't work with
     ReflectionMethod::invokeArgs()). (Laruence)
 
 - SOAP
   . Fixed basic HTTP authentication for WSDL sub requests. (Dmitry)
   . Fixed bug #60887 (SoapClient ignores user_agent option and sends no
     User-Agent header). (carloschilazo at gmail dot com)
-  . Fixed bug #60842, #51775 (Chunked response parsing error when 
+  . Fixed bug #60842, #51775 (Chunked response parsing error when
     chunksize length line is > 10 bytes). (Ilia)
   . Fixed bug #49853 (Soap Client stream context header option ignored).
     (Dmitry)
@@ -1498,7 +1824,7 @@ PHP                                                                        NEWS
 02 Feb 2012, PHP 5.3.10
 
 - Core:
-  . Fixed arbitrary remote code execution vulnerability reported by Stefan 
+  . Fixed arbitrary remote code execution vulnerability reported by Stefan
     Esser, CVE-2012-0830. (Stas, Dmitry)
 
 10 Jan 2012, PHP 5.3.9
@@ -1511,7 +1837,7 @@ PHP                                                                        NEWS
     GC). (Dmitry)
   . Fixed bug #60138 (GC crash with referenced array in RecursiveArrayIterator)
     (Dmitry).
-  . Fixed bug #60120 (proc_open's streams may hang with stdin/out/err when 
+  . Fixed bug #60120 (proc_open's streams may hang with stdin/out/err when
     the data exceeds or is equal to 2048 bytes). (Pierre, Pascal Borreli)
   . Fixed bug #60099 (__halt_compiler() works in braced namespaces). (Felipe)
   . Fixed bug #60019 (Function time_nanosleep() is undefined on OS X). (Ilia)
@@ -1535,7 +1861,7 @@ PHP                                                                        NEWS
     HTTP POST request). (Hannes)
   . Fixed bug #55475 (is_a() triggers autoloader, new optional 3rd argument to
     is_a and is_subclass_of). (alan_k)
-  . Fixed bug #52461 (Incomplete doctype and missing xmlns). 
+  . Fixed bug #52461 (Incomplete doctype and missing xmlns).
     (virsacer at web dot de, Pierre)
   . Fixed bug #55366 (keys lost when using substr_replace an array). (Arpad)
   . Fixed bug #55273 (base64_decode() with strict rejects whitespace after
@@ -1592,7 +1918,7 @@ PHP                                                                        NEWS
   . Fixed memory leak when calling the Finfo constructor twice. (Felipe)
 
 - Filter:
-  . Fixed Bug #55478 (FILTER_VALIDATE_EMAIL fails with internationalized 
+  . Fixed Bug #55478 (FILTER_VALIDATE_EMAIL fails with internationalized
     domain name addresses containing >1 -). (Ilia)
 
 - FTP:
@@ -1626,7 +1952,7 @@ PHP                                                                        NEWS
   . Fixed bug #55859 (mysqli->stat property access gives error). (Andrey)
   . Fixed bug #55582 (mysqli_num_rows() returns always 0 for unbuffered, when
     mysqlnd is used). (Andrey)
-  . Fixed bug #55703 (PHP crash when calling mysqli_fetch_fields). 
+  . Fixed bug #55703 (PHP crash when calling mysqli_fetch_fields).
     (eran at zend dot com, Laruence)
 
 - mysqlnd
@@ -1663,9 +1989,9 @@ PHP                                                                        NEWS
 
 - PDO MySQL driver:
   . Fixed bug #60155 (pdo_mysql.default_socket ignored). (Johannes)
-  . Fixed bug #55870 (PDO ignores all SSL parameters when used with mysql 
+  . Fixed bug #55870 (PDO ignores all SSL parameters when used with mysql
     native driver). (Pierre)
-  . Fixed bug #54158 (MYSQLND+PDO MySQL requires #define 
+  . Fixed bug #54158 (MYSQLND+PDO MySQL requires #define
     MYSQL_OPT_LOCAL_INFILE). (Andrey)
 
 - PDO OCI driver:
@@ -1706,7 +2032,7 @@ PHP                                                                        NEWS
   . Added partial syslog support (on error_log only). FR #52052. (fat)
 
 - Postgres:
-  . Fixed bug #60244 (pg_fetch_* functions do not validate that row param 
+  . Fixed bug #60244 (pg_fetch_* functions do not validate that row param
     is >0). (Ilia)
   . Added PGSQL_LIBPQ_VERSION/PGSQL_LIBPQ_VERSION_STR constants. (Yasuo)
 
@@ -1718,7 +2044,7 @@ PHP                                                                        NEWS
 
 - SimpleXML:
   . Reverted the SimpleXML->query() behaviour to returning empty arrays
-    instead of false when no nodes are found as it was since 5.3.3 
+    instead of false when no nodes are found as it was since 5.3.3
     (bug #48601). (chregu, rrichards)
 
 - SOAP
@@ -1751,7 +2077,7 @@ PHP                                                                        NEWS
 
 - XSL:
   . Added xsl.security_prefs ini option to define forbidden operations within
-    XSLT stylesheets, default is not to enable write operations. This option 
+    XSLT stylesheets, default is not to enable write operations. This option
     won't be in 5.4, since there's a new method. Fixes Bug #54446. (Chregu,
     Nicolas Gregoire)
 
@@ -1779,7 +2105,7 @@ PHP                                                                        NEWS
     (Pierrick, Felipe)
   . Fixed bug #54624 (class_alias and type hint). (Felipe)
   . Fixed bug #54585 (track_errors causes segfault). (Dmitry)
-  . Fixed bug #54423 (classes from dl()'ed extensions are not destroyed). 
+  . Fixed bug #54423 (classes from dl()'ed extensions are not destroyed).
     (Tony, Dmitry)
   . Fixed bug #54372 (Crash accessing global object itself returned from its
     __get() handle). (Dmitry)
@@ -1792,13 +2118,13 @@ PHP                                                                        NEWS
 
 - Core
   . Updated crypt_blowfish to 1.2. ((CVE-2011-2483) (Solar Designer)
-  . Removed warning when argument of is_a() or is_subclass_of() is not 
+  . Removed warning when argument of is_a() or is_subclass_of() is not
     a known class. (Stas)
   . Fixed crash in error_log(). (Felipe) Reported by Mateusz Kocielski.
   . Added PHP_MANDIR constant telling where the manpages were installed into,
     and an --man-dir argument to php-config. (Hannes)
   . Fixed a crash inside dtor for error handling. (Ilia)
-  . Fixed buffer overflow on overlog salt in crypt(). (Clément LECIGNE, Stas)  
+  . Fixed buffer overflow on overlog salt in crypt(). (Clément LECIGNE, Stas)
   . Implemented FR #54459 (Range function accuracy). (Adam)
 
   . Fixed bug #55399 (parse_url() incorrectly treats ':' as a valid path).
@@ -1807,7 +2133,7 @@ PHP                                                                        NEWS
     (Dmitry)
   . Fixed bug #55295 [NEW]: popen_ex on windows, fixed possible heap overflow
     (Pierre)
-  . Fixed bug #55258 (Windows Version Detecting Error). 
+  . Fixed bug #55258 (Windows Version Detecting Error).
     ( xiaomao5 at live dot com, Pierre)
   . Fixed bug #55187 (readlink returns weird characters when false result).
    (Pierre)
@@ -1851,7 +2177,7 @@ PHP                                                                        NEWS
     (Pierrick, Dmitry)
   . Fixed bug #50363 (Invalid parsing in convert.quoted-printable-decode
     filter). (slusarz at curecanti dot org)
-  . Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent when using 
+  . Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent when using
     TMPDIR on Windows). (Pierre)
 
 - Apache2 Handler SAPI:
@@ -1864,7 +2190,7 @@ PHP                                                                        NEWS
 - cURL extension:
   . Added ini option curl.cainfo (support for custom cert db). (Pierre)
   . Added CURLINFO_REDIRECT_URL support. (Daniel Stenberg, Pierre)
-  . Added support for CURLOPT_MAX_RECV_SPEED_LARGE and 
+  . Added support for CURLOPT_MAX_RECV_SPEED_LARGE and
     CURLOPT_MAX_SEND_SPEED_LARGE. FR #51815. (Pierrick)
 
 - DateTime extension:
@@ -1891,10 +2217,10 @@ PHP                                                                        NEWS
   . Added 3rd parameter to filter_var_array() and filter_input_array()
     functions that allows disabling addition of empty elements. (Ilia)
   . Fixed bug #53037 (FILTER_FLAG_EMPTY_STRING_NULL is not implemented). (Ilia)
-  
+
 - Interbase extension:
   . Fixed bug #54269 (Short exception message buffer causes crash). (Felipe)
-  
+
 - intl extension:
   . Implemented FR #54561 (Expose ICU version info). (David Zuelke, Ilia)
   . Implemented FR #54540 (Allow loading of arbitrary resource bundles when
@@ -1905,7 +2231,7 @@ PHP                                                                        NEWS
     (kevin at kevinlocke dot name)
 
 - json extension:
-  . Fixed bug #54484 (Empty string in json_decode doesn't reset 
+  . Fixed bug #54484 (Empty string in json_decode doesn't reset
     json_last_error()). (Ilia)
 
 - LDAP extension:
@@ -1922,7 +2248,7 @@ PHP                                                                        NEWS
 - MCrypt extension:
   . Change E_ERROR to E_WARNING in mcrypt_create_iv when not enough data
     has been fetched (Windows). (Pierre)
-  . Fixed bug #55169 (mcrypt_create_iv always fails to gather sufficient random 
+  . Fixed bug #55169 (mcrypt_create_iv always fails to gather sufficient random
     data on Windows). (Pierre)
 
 - mysqlnd
@@ -1954,7 +2280,7 @@ PHP                                                                        NEWS
 
 - PDO extension:
   . Fixed bug #54929 (Parse error with single quote in sql comment). (Felipe)
-  . Fixed bug #52104 (bindColumn creates Warning regardless of ATTR_ERRMODE 
+  . Fixed bug #52104 (bindColumn creates Warning regardless of ATTR_ERRMODE
     settings). (Ilia)
 
 - PDO DBlib driver:
@@ -2077,7 +2403,7 @@ PHP                                                                        NEWS
   . Fixed bug #48607 (fwrite() doesn't check reply from ftp server before
     exiting). (Ilia)
 
- 
+
 - Calendar extension:
   . Fixed bug #53574 (Integer overflow in SdnToJulian, sometimes leading to
     segfault). (Gustavo)
@@ -2085,18 +2411,18 @@ PHP                                                                        NEWS
 - DOM extension:
   . Implemented FR #39771 (Made DOMDocument::saveHTML accept an optional DOMNode
     like DOMDocument::saveXML). (Gustavo)
-  
+
 - DateTime extension:
   . Fixed a bug in DateTime->modify() where absolute date/time statements had
     no effect. (Derick)
   . Fixed bug #53729 (DatePeriod fails to initialize recurrences on 64bit
     big-endian systems). (Derick, rein@basefarm.no)
   . Fixed bug #52808 (Segfault when specifying interval as two dates). (Stas)
-  . Fixed bug #52738 (Can't use new properties in class extended from 
+  . Fixed bug #52738 (Can't use new properties in class extended from
     DateInterval). (Stas)
   . Fixed bug #52290 (setDate, setISODate, setTime works wrong when DateTime
     created from timestamp). (Stas)
-  . Fixed bug #52063 (DateTime constructor's second argument doesn't have a 
+  . Fixed bug #52063 (DateTime constructor's second argument doesn't have a
     null default value). (Gustavo, Stas)
 
 - Exif extension:
@@ -2117,20 +2443,20 @@ PHP                                                                        NEWS
     (Hannes)
 
 - Gettext
-  . Fixed bug #53837 (_() crashes on Windows when no LANG or LANGUAGE 
+  . Fixed bug #53837 (_() crashes on Windows when no LANG or LANGUAGE
     environment variable are set). (Pierre)
 
 - IMAP extension:
   . Implemented FR #53812 (get MIME headers of the part of the email). (Stas)
   . Fixed bug #53377 (imap_mime_header_decode() doesn't ignore \t during long
     MIME header unfolding). (Adam)
-    
+
 - Intl extension:
   . Fixed bug #53612 (Segmentation fault when using cloned several intl
     objects). (Gustavo)
   . Fixed bug #53512 (NumberFormatter::setSymbol crash on bogus $attr values).
     (Felipe)
-  . Implemented clone functionality for number, date & message formatters. 
+  . Implemented clone functionality for number, date & message formatters.
     (Stas).
 
 - JSON extension:
@@ -2138,20 +2464,20 @@ PHP                                                                        NEWS
     decodings). (Scott)
 
 - mysqlnd
-  . Fixed problem with always returning 0 as num_rows for unbuffered sets. 
+  . Fixed problem with always returning 0 as num_rows for unbuffered sets.
     (Andrey, Ulf)
 
 - MySQL Improved extension:
-  . Added 'db' and 'catalog' keys to the field fetching functions (FR #39847). 
+  . Added 'db' and 'catalog' keys to the field fetching functions (FR #39847).
     (Kalle)
   . Fixed buggy counting of affected rows when using the text protocol. The
     collected statistics were wrong when multi_query was used with mysqlnd
     (Andrey)
-  . Fixed bug #53795 (Connect Error from MySqli (mysqlnd) when using SSL). 
+  . Fixed bug #53795 (Connect Error from MySqli (mysqlnd) when using SSL).
     (Kalle)
-  . Fixed bug #53503 (mysqli::query returns false after successful LOAD DATA 
+  . Fixed bug #53503 (mysqli::query returns false after successful LOAD DATA
     query). (Kalle, Andrey)
-  . Fixed bug #53425 (mysqli_real_connect() ignores client flags when built to 
+  . Fixed bug #53425 (mysqli_real_connect() ignores client flags when built to
     call libmysql). (Kalle, tre-php-net at crushedhat dot com)
 
 - OpenSSL extension:
@@ -2168,13 +2494,13 @@ PHP                                                                        NEWS
 - PDO MySQL driver:
   . Fixed bug #53551 (PDOStatement execute segfaults for pdo_mysql driver).
     (Johannes)
-  . Implemented FR #47802 (Support for setting character sets in DSN strings). 
+  . Implemented FR #47802 (Support for setting character sets in DSN strings).
     (Kalle)
 
 - PDO Oracle driver:
   . Fixed bug #39199 (Cannot load Lob data with more than 4000 bytes on
     ORACLE 10). (spatar at mail dot nnov dot ru)
-    
+
 - PDO PostgreSQL driver:
   . Fixed bug #53517 (segfault in pgsql_stmt_execute() when postgres is down).
     (gyp at balabit dot hu)
@@ -2184,7 +2510,7 @@ PHP                                                                        NEWS
     (CVE-2011-1153)
   . Fixed bug #53541 (format string bug in ext/phar).
     (crrodriguez at opensuse dot org, Ilia)
-  . Fixed bug #53898 (PHAR reports invalid error message, when the directory 
+  . Fixed bug #53898 (PHAR reports invalid error message, when the directory
     does not exist). (Ilia)
 
 - PHP-FPM SAPI:
@@ -2215,7 +2541,7 @@ PHP                                                                        NEWS
     (Mateusz Kocielski, Pierre)
 
 - SPL extension:
-  . Fixed memory leak in DirectoryIterator::getExtension() and 
+  . Fixed memory leak in DirectoryIterator::getExtension() and
     SplFileInfo::getExtension(). (Felipe)
   . Fixed bug #53914 (SPL assumes HAVE_GLOB is defined). (Chris Jones)
   . Fixed bug #53515 (property_exists incorrect on ArrayObject null and 0
@@ -2265,13 +2591,13 @@ PHP                                                                        NEWS
     (Hannes)
   . Fixed bug #53568 (swapped memset arguments in struct initialization).
     (crrodriguez at opensuse dot org)
-  . Fixed bug #53166 (Missing parameters in docs and reflection definition). 
+  . Fixed bug #53166 (Missing parameters in docs and reflection definition).
     (Richard)
   . Fixed bug #49072 (feof never returns true for damaged file in zip).
     (Gustavo, Richard Quadling)
 
 06 Jan 2011, PHP 5.3.5
-- Fixed Bug #53632 (infinite loop with x87 fpu). (CVE-2010-4645) (Scott, 
+- Fixed Bug #53632 (infinite loop with x87 fpu). (CVE-2010-4645) (Scott,
   Rasmus)
 
 09 Dec 2010, PHP 5.3.4
@@ -2279,11 +2605,11 @@ PHP                                                                        NEWS
 - Upgraded bundled PCRE to version 8.10. (Ilia)
 
 - Security enhancements:
-  . Fixed crash in zip extract method (possible CWE-170). 
+  . Fixed crash in zip extract method (possible CWE-170).
     (Maksymilian Arciemowicz, Pierre)
   . Paths with NULL in them (foo\0bar.txt) are now considered as invalid.
     (Rasmus)
-  . Fixed a possible double free in imap extension (Identified by Mateusz 
+  . Fixed a possible double free in imap extension (Identified by Mateusz
     Kocielski). (CVE-2010-4150). (Ilia)
   . Fixed NULL pointer dereference in ZipArchive::getArchiveComment.
     (CVE-2010-3709). (Maksymilian Arciemowicz)
@@ -2295,23 +2621,23 @@ PHP                                                                        NEWS
 
 - General improvements:
   . Added stat support for zip stream. (Pierre)
-  . Added follow_location (enabled by default) option for the http stream 
+  . Added follow_location (enabled by default) option for the http stream
     support. (Pierre)
   . Improved support for is_link and related functions on Windows. (Pierre)
   . Added a 3rd parameter to get_html_translation_table. It now takes a charset
     hint, like htmlentities et al. (Gustavo)
- 
+
 - Implemented feature requests:
   . Implemented FR #52348, added new constant ZEND_MULTIBYTE to detect
     zend multibyte at runtime. (Kalle)
-  . Implemented FR #52173, added functions pcntl_get_last_error() and 
+  . Implemented FR #52173, added functions pcntl_get_last_error() and
      pcntl_strerror(). (nick dot telford at gmail dot com, Arnaud)
   . Implemented symbolic links support for open_basedir checks. (Pierre)
   . Implemented FR #51804, SplFileInfo::getLinkTarget on Windows. (Pierre)
   . Implemented FR #50692, not uploaded files don't count towards
     max_file_uploads limit. As a side improvement, temporary files are not
     opened for empty uploads and, in debug mode, 0-length uploads. (Gustavo)
-    
+
 - Improved MySQLnd:
   . Added new character sets to mysqlnd, which are available in MySQL 5.5
     (Andrey)
@@ -2323,7 +2649,7 @@ PHP                                                                        NEWS
   . Added '-t/--test' to php-fpm to check and validate FPM conf file. (fat)
   . Added statistics about listening socket queue length for FPM.
     (andrei dot nigmatulin at gmail dot com, fat)
-    
+
 - Core:
   . Fixed extract() to do not overwrite $GLOBALS and $this when using
     EXTR_OVERWRITE. (jorto at redhat dot com)
@@ -2337,7 +2663,7 @@ PHP                                                                        NEWS
   . Fixed bug #53304 (quot_print_decode does not handle lower-case hex digits).
     (Ilia, daniel dot mueller at inexio dot net)
   . Fixed bug #53248 (rawurlencode RFC 3986 EBCDIC support misses tilde char).
-    (Justin Martin)  
+    (Justin Martin)
   . Fixed bug #53226 (file_exists fails on big filenames). (Adam)
   . Fixed bug #53198 (changing INI setting "from" with ini_set did not have any
     effect). (Gustavo)
@@ -2353,7 +2679,7 @@ PHP                                                                        NEWS
     decode &#34; if ENT_NOQUOTES is given. (Gustavo)
   . Fixed bug #52931 (strripos not overloaded with function overloading
     enabled). (Felipe)
-  . Fixed bug #52772 (var_dump() doesn't check for the existence of 
+  . Fixed bug #52772 (var_dump() doesn't check for the existence of
     get_class_name before calling it). (Kalle, Gustavo)
   . Fixed bug #52534 (var_export array with negative key). (Felipe)
   . Fixed bug #52327 (base64_decode() improper handling of leading padding in
@@ -2368,22 +2694,22 @@ PHP                                                                        NEWS
     of reported malformed sequences). (CVE-2010-3870) (Gustavo)
   . Fixed bug #49407 (get_html_translation_table doesn't handle UTF-8).
     (Gustavo)
-  . Fixed bug #48831 (php -i has different output to php --ini). (Richard, 
+  . Fixed bug #48831 (php -i has different output to php --ini). (Richard,
     Pierre)
   . Fixed bug #47643 (array_diff() takes over 3000 times longer than php 5.2.4).
     (Felipe)
-  . Fixed bug #47168 (printf of floating point variable prints maximum of 40 
+  . Fixed bug #47168 (printf of floating point variable prints maximum of 40
     decimal places). (Ilia)
   . Fixed bug #46587 (mt_rand() does not check that max is greater than min).
     (Ilia)
   . Fixed bug #29085 (bad default include_path on Windows). (Pierre)
   . Fixed bug #25927 (get_html_translation_table calls the ' &#39; instead of
     &#039;). (Gustavo)
-    
+
 - Zend engine:
   . Reverted fix for bug #51176 (Static calling in non-static method behaves
     like $this->). (Felipe)
-  . Changed deprecated ini options on startup from E_WARNING to E_DEPRECATED. 
+  . Changed deprecated ini options on startup from E_WARNING to E_DEPRECATED.
     (Kalle)
   . Fixed NULL dereference in lex_scan on zend multibyte builds where the script
     had a flex incompatible encoding and there was no converter. (Gustavo)
@@ -2403,7 +2729,7 @@ PHP                                                                        NEWS
   . Fixed bug #52361 (Throwing an exception in a destructor causes invalid
     catching). (Dmitry)
   . Fixed bug #51008 (Zend/tests/bug45877.phpt fails). (Dmitry)
-  
+
 - Build issues:
   . Fixed bug #52436 (Compile error if systems do not have stdint.h)
     (Sriram Natarajan)
@@ -2414,7 +2740,7 @@ PHP                                                                        NEWS
 - Calendar extension:
   . Fixed bug #52744 (cal_days_in_month incorrect for December 1 BCE).
    (gpap at internet dot gr, Adam)
-    
+
 - cURL extension:
   . Fixed bug #52828 (curl_setopt does not accept persistent streams).
     (Gustavo, Ilia)
@@ -2422,7 +2748,7 @@ PHP                                                                        NEWS
     (CURLOPT_STDERR)). (Gustavo)
   . Fixed bug #52202 (CURLOPT_PRIVATE gets corrupted). (Ilia)
   . Fixed bug #50410 (curl extension slows down PHP on Windows). (Pierre)
-    
+
 - DateTime extension:
   . Fixed bug #53297 (gettimeofday implementation in php/win32/time.c can return
     1 million microsecs). (ped at 7gods dot org)
@@ -2451,7 +2777,7 @@ PHP                                                                        NEWS
   . Fixed bug #53492 (fix crash if anti-aliasing steps are invalid). (Pierre)
 
 - GMP extension:
-  . Fixed bug #52906 (gmp_mod returns negative result when non-negative is 
+  . Fixed bug #52906 (gmp_mod returns negative result when non-negative is
     expected). (Stas)
   . Fixed bug #52849 (GNU MP invalid version match). (Adam)
 
@@ -2464,7 +2790,7 @@ PHP                                                                        NEWS
     headers). (Adam)
   . Fixed bug #52599 (iconv output handler outputs incorrect content type
     when flags are used). (Ilia)
-  . Fixed bug #51250 (iconv_mime_decode() does not ignore malformed Q-encoded 
+  . Fixed bug #51250 (iconv_mime_decode() does not ignore malformed Q-encoded
     words). (Ilia)
 
 - Intl extension:
@@ -2474,7 +2800,7 @@ PHP                                                                        NEWS
     (Stas)
   . Fixed bug #50590 (IntlDateFormatter::parse result is limited to the integer
     range). (Stas)
-    
+
 - Mbstring extension:
   . Fixed bug #53273 (mb_strcut() returns garbage with the excessive length
     parameter). (CVE-2010-4156) (Mateusz Kocielski, Pierre, Moriyoshi)
@@ -2483,16 +2809,16 @@ PHP                                                                        NEWS
     with the distribution) (Gustavo).
   . Fixed bug #52681 (mb_send_mail() appends an extra MIME-Version header).
     (Adam)
- 
+
 - MSSQL extension:
   . Fixed possible crash in mssql_fetch_batch(). (Kalle)
   . Fixed bug #52843 (Segfault when optional parameters are not passed in to
     mssql_connect). (Felipe)
-    
+
 - MySQL extension:
-  . Fixed bug #52636 (php_mysql_fetch_hash writes long value into int). 
+  . Fixed bug #52636 (php_mysql_fetch_hash writes long value into int).
     (Kalle, rein at basefarm dot no)
-    
+
 - MySQLi extension:
   . Fixed bug #52891 (Wrong data inserted with mysqli/mysqlnd when using
     mysqli_stmt_bind_param and value> PHP_INT_MAX). (Andrey)
@@ -2509,10 +2835,10 @@ PHP                                                                        NEWS
     (Andrey)
   . Fixed bug #52221 (Misbehaviour of magic_quotes_runtime (get/set)). (Andrey)
   . Fixed bug #45921 (Can't initialize character set hebrew). (Andrey)
-  
+
 - MySQLnd:
   . Fixed bug #52613 (crash in mysqlnd after hitting memory limit). (Andrey)
-     
+
 - ODBC extension:
   - Fixed bug #52512 (Broken error handling in odbc_execute).
     (mkoegler at auto dot tuwien dot ac dot at)
@@ -2529,11 +2855,11 @@ PHP                                                                        NEWS
   . Fixed bug #51610 (Using oci_connect causes PHP to take a long time to
     exit).  Requires Oracle 11.2.0.2 client libraries (or Oracle bug fix
     9891199) for this patch to have an effect. (Oracle Corp.)
-      
+
 - PCNTL extension:
   . Fixed bug #52784 (Race condition when handling many concurrent signals).
     (nick dot telford at gmail dot com, Arnaud)
-    
+
 - PCRE extension:
   . Fixed bug #52971 (PCRE-Meta-Characters not working with utf-8). (Felipe)
   . Fixed bug #52732 (Docs say preg_match() returns FALSE on error, but it
@@ -2557,27 +2883,27 @@ PHP                                                                        NEWS
 
 - PDO:
   . Fixed bug #52699 (PDO bindValue writes long int 32bit enum).
-    (rein at basefarm dot no) 
+    (rein at basefarm dot no)
   . Fixed bug #52487 (PDO::FETCH_INTO leaks memory). (Felipe)
-  
+
 - PDO DBLib driver:
   . Fixed bug #52546 (pdo_dblib segmentation fault when iterating MONEY values).
     (Felipe)
-    
+
 - PDO Firebird driver:
   . Restored firebird support (VC9 builds only). (Pierre)
   . Fixed bug #53335 (pdo_firebird did not implement rowCount()).
     (preeves at ibphoenix dot com)
   . Fixed bug #53323 (pdo_firebird getAttribute() crash).
     (preeves at ibphoenix dot com)
-    
+
 - PDO MySQL driver:
   . Fixed bug #52745 (Binding params doesn't work when selecting a date inside a
     CASE-WHEN). (Andrey)
-    
+
 - PostgreSQL extension:
   . Fixed bug #47199 (pg_delete() fails on NULL). (ewgraf at gmail dot com)
-  
+
 - Reflection extension:
   . Fixed ReflectionProperty::isDefault() giving a wrong result for properties
     obtained with ReflectionClass::getProperties(). (Gustavo)
@@ -2586,11 +2912,11 @@ PHP                                                                        NEWS
     getProperty()). (Felipe)
   . Fixed bug #52854 (ReflectionClass::newInstanceArgs does not work for classes
     without constructors). (Johannes)
-  
+
 - SOAP extension:
   . Fixed bug #44248 (RFC2616 transgression while HTTPS request through proxy
     with SoapClient object). (Dmitry)
-    
+
 - SPL extension:
   . Fixed bug #53362 (Segmentation fault when extending SplFixedArray). (Felipe)
   . Fixed bug #53279 (SplFileObject doesn't initialise default CSV escape
@@ -2598,7 +2924,7 @@ PHP                                                                        NEWS
   . Fixed bug #53144 (Segfault in SplObjectStorage::removeAll()). (Felipe)
   . Fixed bug #53071 (SPLObjectStorage defeats gc_collect_cycles). (Gustavo)
   . Fixed bug #52573 (SplFileObject::fscanf Segmentation fault). (Felipe)
-  . Fixed bug #51763 (SplFileInfo::getType() does not work symbolic link 
+  . Fixed bug #51763 (SplFileInfo::getType() does not work symbolic link
     and directory). (Pierre)
   . Fixed bug #50481 (Storing many SPLFixedArray in an array crashes). (Felipe)
   . Fixed bug #50579 (RegexIterator::REPLACE doesn't work). (Felipe)
@@ -2606,7 +2932,7 @@ PHP                                                                        NEWS
 - SQLite3 extension:
   . Fixed bug #53463 (sqlite3 columnName() segfaults on bad column_number).
     (Felipe)
-    
+
 - Streams:
   . Fixed forward stream seeking emulation in streams that don't support seeking
     in situations where the read operation gives back less data than requested
@@ -2625,7 +2951,7 @@ PHP                                                                        NEWS
 - WDDX extension:
   . Fixed bug #52468 (wddx_deserialize corrupts integer field value when left
     empty). (Felipe)
-     
+
 - Zlib extension:
   . Fixed bug #52926 (zlib fopen wrapper does not use context). (Gustavo)
 
@@ -2633,11 +2959,11 @@ PHP                                                                        NEWS
 - Upgraded bundled sqlite to version 3.6.23.1. (Ilia)
 - Upgraded bundled PCRE to version 8.02. (Ilia)
 
-- Added support for JSON_NUMERIC_CHECK option in json_encode() that converts 
+- Added support for JSON_NUMERIC_CHECK option in json_encode() that converts
   numeric strings to integers. (Ilia)
 - Added stream_set_read_buffer, allows to set the buffer for read operation.
   (Pierre)
-- Added stream filter support to mcrypt extension (ported from 
+- Added stream filter support to mcrypt extension (ported from
   mcrypt_filter). (Stas)
 - Added full_special_chars filter to ext/filter. (Rasmus)
 - Added backlog socket context option for stream_socket_server(). (Mike)
@@ -2646,10 +2972,10 @@ PHP                                                                        NEWS
   Made implicit use of NULL IV a warning. (Sara)
 - Added openssl_cipher_iv_length(). (Sara)
 - Added FastCGI Process Manager (FPM) SAPI. (Tony)
-- Added recent Windows versions to php_uname and fix undefined windows 
+- Added recent Windows versions to php_uname and fix undefined windows
   version support. (Pierre)
 - Added Berkeley DB 5 support to the DBA extension. (Johannes, Chris Jones)
-- Added support for copy to/from array/file for pdo_pgsql extension. 
+- Added support for copy to/from array/file for pdo_pgsql extension.
   (Denis Gasparin, Ilia)
 - Added inTransaction() method to PDO, with specialized support for Postgres.
   (Ilia, Denis Gasparin)
@@ -2669,7 +2995,7 @@ PHP                                                                        NEWS
   Reported by Stefan Esser. (Andrey)
 - Fixed very rare memory leak in mysqlnd, when binding thousands of columns.
   (Andrey)
-- Fixed a crash when calling an inexistent method of a class that inherits 
+- Fixed a crash when calling an inexistent method of a class that inherits
   PDOStatement if instantiated directly instead of doing by the PDO methods.
   (Felipe)
 
@@ -2688,15 +3014,15 @@ PHP                                                                        NEWS
   (Dmitry)
 - Fixed a possible memory corruption in pack(). Reported by Stefan Esser.
   (Dmitry)
-- Fixed a possible memory corruption in substr_replace(). Reported by Stefan    
+- Fixed a possible memory corruption in substr_replace(). Reported by Stefan
   Esser. (Dmitry)
-- Fixed a possible memory corruption in addcslashes(). Reported by Stefan    
+- Fixed a possible memory corruption in addcslashes(). Reported by Stefan
   Esser. (Dmitry)
-- Fixed a possible stack exhaustion inside fnmatch(). Reported by Stefan    
+- Fixed a possible stack exhaustion inside fnmatch(). Reported by Stefan
   Esser. (Ilia)
 - Fixed a possible dechunking filter buffer overflow. Reported by Stefan Esser.
   (Pierre)
-- Fixed a possible arbitrary memory access inside sqlite extension. Reported 
+- Fixed a possible arbitrary memory access inside sqlite extension. Reported
   by Mateusz Kocielski. (Ilia)
 - Fixed string format validation inside phar extension. Reported by Stefan
   Esser. (Ilia)
@@ -2719,7 +3045,7 @@ PHP                                                                        NEWS
 - Fixed bug #52193 (converting closure to array yields empty array). (Felipe)
 - Fixed bug #52183 (Reflectionfunction reports invalid number of arguments for
   function aliases). (Felipe)
-- Fixed bug #52162 (custom request header variables with numbers are removed). 
+- Fixed bug #52162 (custom request header variables with numbers are removed).
   (Sriram Natarajan)
 - Fixed bug #52160 (Invalid E_STRICT redefined constructor error). (Felipe)
 - Fixed bug #52138 (Constants are parsed into the ini file for section names).
@@ -2731,15 +3057,15 @@ PHP                                                                        NEWS
 - Fixed bug #52082 (character_set_client & character_set_connection reset after
   mysqli_change_user()). (Andrey)
 - Fixed bug #52043 (GD doesn't recognize latest libJPEG versions).
-  (php at group dot apple dot com, Pierre) 
+  (php at group dot apple dot com, Pierre)
 - Fixed bug #52041 (Memory leak when writing on uninitialized variable returned
   from function). (Dmitry)
 - Fixed bug #52060 (Memory leak when passing a closure to method_exists()).
   (Felipe)
 - Fixed bug #52057 (ReflectionClass fails on Closure class). (Felipe)
-- Fixed bug #52051 (handling of case sensitivity of old-style constructors 
+- Fixed bug #52051 (handling of case sensitivity of old-style constructors
   changed in 5.3+). (Felipe)
-- Fixed bug #52037 (Concurrent builds fail in install-programs). (seanius at 
+- Fixed bug #52037 (Concurrent builds fail in install-programs). (seanius at
   debian dot org, Kalle)
 - Fixed bug #52019 (make lcov doesn't support TESTS variable anymore). (Patrick)
 - Fixed bug #52010 (open_basedir restrictions mismatch on vacuum command).
@@ -2747,7 +3073,7 @@ PHP                                                                        NEWS
 - Fixed bug #52001 (Memory allocation problems after using variable variables).
   (Dmitry)
 - Fixed bug #51991 (spl_autoload and *nix support with namespace). (Felipe)
-- Fixed bug #51943 (AIX: Several files are out of ANSI spec). (Kalle, 
+- Fixed bug #51943 (AIX: Several files are out of ANSI spec). (Kalle,
   coreystup at gmail dot com)
 - Fixed bug #51911 (ReflectionParameter::getDefaultValue() memory leaks with
   constant array). (Felipe)
@@ -2812,7 +3138,7 @@ PHP                                                                        NEWS
 - Fixed bug #51435 (Missing ifdefs / logic bug in crypt code cause compile
   errors). (Felipe)
 - Fixed bug #51424 (crypt() function hangs after 3rd call). (Pierre, Sriram)
-- Fixed bug #51394 (Error line reported incorrectly if error handler throws an 
+- Fixed bug #51394 (Error line reported incorrectly if error handler throws an
   exception). (Stas)
 - Fixed bug #51393 (DateTime::createFromFormat() fails if format string contains
   timezone). (Adam)
@@ -2831,15 +3157,15 @@ PHP                                                                        NEWS
 - Fixed bug #51242 (Empty mysql.default_port does not default to 3306 anymore,
   but 0). (Adam)
 - Fixed bug #51237 (milter SAPI crash on startup). (igmar at palsenberg dot com)
-- Fixed bug #51213 (pdo_mssql is trimming value of the money column). (Ilia, 
+- Fixed bug #51213 (pdo_mssql is trimming value of the money column). (Ilia,
   alexr at oplot dot com)
-- Fixed bug #51190 (ftp_put() returns false when transfer was successful).  
+- Fixed bug #51190 (ftp_put() returns false when transfer was successful).
   (Ilia)
 - Fixed bug #51183 (ext/date/php_date.c fails to compile with Sun Studio).
   (Sriram Natarajan)
 - Fixed bug #51176 (Static calling in non-static method behaves like $this->).
   (Felipe)
-- Fixed bug #51171 (curl_setopt() doesn't output any errors or warnings when    
+- Fixed bug #51171 (curl_setopt() doesn't output any errors or warnings when
   an invalid option is provided). (Ilia)
 - Fixed bug #51128 (imagefill() doesn't work with large images). (Pierre)
 - Fixed bug #51096 ('last day' and 'first day' are handled incorrectly when
@@ -2859,7 +3185,7 @@ PHP                                                                        NEWS
   if defined in WSDL). (mephius at gmail dot com)
 - Fixed bug #50731 (Inconsistent namespaces sent to functions registered with
   spl_autoload_register). (Felipe)
-- Fixed bug #50563 (removing E_WARNING from parse_url). (ralph at smashlabs dot 
+- Fixed bug #50563 (removing E_WARNING from parse_url). (ralph at smashlabs dot
   com, Pierre)
 - Fixed bug #50578 (incorrect shebang in phar.phar). (Fedora at FamilleCollet
   dot com)
@@ -2908,7 +3234,7 @@ PHP                                                                        NEWS
   (vincent at optilian dot com)
 - Fixed bug #43233 (sasl support for ldap on Windows). (Pierre)
 - Fixed bug #35673 (formatOutput does not work with saveHTML). (Rob)
-- Fixed bug #33210 (getimagesize() fails to detect width/height on certain 
+- Fixed bug #33210 (getimagesize() fails to detect width/height on certain
   JPEGs). (Ilia)
 
 04 Mar 2010, PHP 5.3.2
@@ -2931,7 +3257,7 @@ PHP                                                                        NEWS
   setting it to 0. (Rasmus)
 - Changed tidyNode class to disallow manual node creation. (Pierrick)
 
-- Removed automatic file descriptor unlocking happening on shutdown and/or 
+- Removed automatic file descriptor unlocking happening on shutdown and/or
   stream close (on all OSes). (Tony, Ilia)
 
 - Added libpng 1.4.0 support. (Pierre)
@@ -2989,7 +3315,7 @@ PHP                                                                        NEWS
   versions). (Derick)
 - Fixed bug #50907 (X-PHP-Originating-Script adding two new lines in *NIX).
   (Ilia)
-- Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation).   
+- Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation).
   (Ilia, hanno at hboeck dot de)
 - Fixed bug #50847 (strip_tags() removes all tags greater then 1023 bytes
   long). (Ilia)
@@ -3024,7 +3350,7 @@ PHP                                                                        NEWS
   and DomDocument). (Dmitry)
 - Fixed bug #50508 (compile failure: Conflicting HEADER type declarations).
   (Jani)
-- Fixed bug #50496 (Use of <stdbool.h> is valid only in a c99 compilation 
+- Fixed bug #50496 (Use of <stdbool.h> is valid only in a c99 compilation
   environment. (Sriram)
 - Fixed bug #50464 (declare encoding doesn't work within an included file).
   (Felipe)
@@ -3046,7 +3372,7 @@ PHP                                                                        NEWS
   (Ilia, Pierrick)
 - Fixed bug #50285 (xmlrpc does not preserve keys in encoded indexed arrays).
   (Felipe)
-- Fixed bug #50282 (xmlrpc_encode_request() changes object into array in 
+- Fixed bug #50282 (xmlrpc_encode_request() changes object into array in
   calling function). (Felipe)
 - Fixed bug #50267 (get_browser(null) does not use HTTP_USER_AGENT). (Jani)
 - Fixed bug #50266 (conflicting types for llabs). (Jani)
@@ -3066,7 +3392,7 @@ PHP                                                                        NEWS
   (tcallawa at redhat dot com)
 - Fixed bug #50207 (segmentation fault when concatenating very large strings on
   64bit linux). (Ilia)
-- Fixed bug #50196 (stream_copy_to_stream() produces warning when source is 
+- Fixed bug #50196 (stream_copy_to_stream() produces warning when source is
   not file). (Stas)
 - Fixed bug #50195 (pg_copy_to() fails when table name contains schema. (Ilia)
 - Fixed bug #50185 (ldap_get_entries() return false instead of an empty array
@@ -3094,7 +3420,7 @@ PHP                                                                        NEWS
 - Fixed bug #49990 (SNMP3 warning message about security level printed twice).
   (Jani)
 - Fixed bug #49985 (pdo_pgsql prepare() re-use previous aborted
-  transaction). (ben dot pineau at gmail dot com, Ilia, Matteo)  
+  transaction). (ben dot pineau at gmail dot com, Ilia, Matteo)
 - Fixed bug #49938 (Phar::isBuffering() returns inverted value). (Greg)
 - Fixed bug #49936 (crash with ftp stream in php_stream_context_get_option()).
   (Pierrick)
@@ -3102,7 +3428,7 @@ PHP                                                                        NEWS
 - Fixed bug #49866 (Making reference on string offsets crashes PHP). (Dmitry)
 - Fixed bug #49855 (import_request_variables() always returns NULL). (Ilia,
   sjoerd at php dot net)
-- Fixed bug #49851, #50451 (http wrapper breaks on 1024 char long headers). 
+- Fixed bug #49851, #50451 (http wrapper breaks on 1024 char long headers).
   (Ilia)
 - Fixed bug #49800 (SimpleXML allow (un)serialize() calls without warning).
   (Ilia, wmeler at wp-sa dot pl)
@@ -3152,7 +3478,7 @@ PHP                                                                        NEWS
 - Upgraded bundled sqlite to version 3.6.19. (Scott)
 - Updated timezone database to version 2009.17 (2009q). (Derick)
 
-- Changed ini file directives [PATH=](on Win32) and [HOST=](on all) to be case 
+- Changed ini file directives [PATH=](on Win32) and [HOST=](on all) to be case
   insensitive. (garretts)
 
 - Restored shebang line check to CGI sapi (not checked by scanner anymore).
@@ -3167,7 +3493,7 @@ PHP                                                                        NEWS
 - Added support for ACL on Windows for thread safe SAPI (Apache2 for example)
   and fix its support on NTS. (Pierre)
 
-- Improved symbolic, mounted volume and junctions support for realpath on 
+- Improved symbolic, mounted volume and junctions support for realpath on
   Windows. (Pierre)
 - Improved readlink on Windows, suppress \??\ and use the drive syntax only.
   (Pierre)
@@ -3179,9 +3505,9 @@ PHP                                                                        NEWS
   API. (Scott)
 
 - Fixed crash in com_print_typeinfo when an invalid typelib is given. (Pierre)
-- Fixed a safe_mode bypass in tempnam() identified by Grzegorz Stachowiak.  
+- Fixed a safe_mode bypass in tempnam() identified by Grzegorz Stachowiak.
   (Rasmus)
-- Fixed a open_basedir bypass in posix_mkfifo() identified by Grzegorz 
+- Fixed a open_basedir bypass in posix_mkfifo() identified by Grzegorz
   Stachowiak.  (Rasmus)
 - Fixed certificate validation inside php_openssl_apply_verification_policy
   (Ryan Sleevi, Ilia)
@@ -3203,7 +3529,7 @@ PHP                                                                        NEWS
   (Maksymilian Arciemowicz, Stas)
 - Fixed signature generation/validation for zip archives in ext/phar. (Greg)
 - Fixed memory leak in stream_is_local(). (Felipe, Tony)
-- Fixed BC break in mime_content_type(), removes the content encoding. (Scott) 
+- Fixed BC break in mime_content_type(), removes the content encoding. (Scott)
 
 - Fixed PECL bug #16842 (oci_error return false when NO_DATA_FOUND is raised).
   (Chris Jones)
@@ -3236,7 +3562,7 @@ PHP                                                                        NEWS
   fclose). (Ilia)
 - Fixed bug #49470 (FILTER_SANITIZE_EMAIL allows disallowed characters).
   (Ilia)
-- Fixed bug #49447 (php engine need to correctly check for socket API 
+- Fixed bug #49447 (php engine need to correctly check for socket API
   return status on windows). (Sriram Natarajan)
 - Fixed bug #49391 (ldap.c utilizing deprecated ldap_modify_s). (Ilia)
 - Fixed bug #49372 (segfault in php_curl_option_curl). (Pierre)
@@ -3271,7 +3597,7 @@ PHP                                                                        NEWS
 - Fixed bug #49074 (private class static fields can be modified by using
   reflection). (Jani)
 - Fixed bug #49072 (feof never returns true for damaged file in zip). (Pierre)
-- Fixed bug #49065 ("disable_functions" php.ini option does not work on 
+- Fixed bug #49065 ("disable_functions" php.ini option does not work on
   Zend extensions). (Stas)
 - Fixed bug #49064 (--enable-session=shared does not work: undefined symbol:
   php_url_scanner_reset_vars). (Jani)
@@ -3294,7 +3620,7 @@ PHP                                                                        NEWS
   in a chunk). (andreas dot streichardt at globalpark dot com, Ilia)
 - Fixed bug #49012 (phar tar signature algorithm reports as Unknown (0) in
   getSignature() call). (Greg)
-- Fixed bug #49000 (PHP CLI in Interactive mode (php -a) crashes 
+- Fixed bug #49000 (PHP CLI in Interactive mode (php -a) crashes
   when including files from function). (Stas)
 - Fixed bug #48994 (zlib.output_compression does not output HTTP headers when
   set to a string value). (Jani)
@@ -3323,10 +3649,10 @@ PHP                                                                        NEWS
 - Fixed bug #48783 (make install will fail saying phar file exists). (Greg)
 - Fixed bug #48774 (SIGSEGVs when using curl_copy_handle()).
   (Sriram Natarajan)
-- Fixed bug #48771 (rename() between volumes fails and reports no error on 
+- Fixed bug #48771 (rename() between volumes fails and reports no error on
   Windows). (Pierre)
 - Fixed bug #48768 (parse_ini_*() crash with INI_SCANNER_RAW). (Jani)
-- Fixed bug #48763 (ZipArchive produces corrupt archive). (dani dot church at 
+- Fixed bug #48763 (ZipArchive produces corrupt archive). (dani dot church at
   gmail dot com, Pierre)
 - Fixed bug #48762 (IPv6 address filter still rejects valid address). (Felipe)
 - Fixed bug #48757 (ReflectionFunction::invoke() parameter issues). (Kalle)
@@ -3343,7 +3669,7 @@ PHP                                                                        NEWS
   files that have been opened with r+). (Ilia)
 - Fixed bug #48719 (parse_ini_*(): scanner_mode parameter is not checked for
   sanity). (Jani)
-- Fixed bug #48718 (FILTER_VALIDATE_EMAIL does not allow numbers in domain  
+- Fixed bug #48718 (FILTER_VALIDATE_EMAIL does not allow numbers in domain
   components). (Ilia)
 - Fixed bug #48681 (openssl signature verification for tar archives broken).
   (Greg)
@@ -3366,7 +3692,7 @@ PHP                                                                        NEWS
 - Fixed bug #48189 (ibase_execute error in return param). (Kalle)
 - Fixed bug #48182 (ssl handshake fails during asynchronous socket connection).
   (Sriram Natarajan)
-- Fixed bug #48116 (Fixed build with Openssl 1.0). (Pierre, 
+- Fixed bug #48116 (Fixed build with Openssl 1.0). (Pierre,
   Al dot Smith at aeschi dot ch dot eu dot org)
 - Fixed bug #48057 (Only the date fields of the first row are fetched, others
   are empty). (info at programmiernutte dot net)
@@ -3391,10 +3717,10 @@ PHP                                                                        NEWS
   com, Kalle)
 - Fixed bug #40013 (php_uname() does not return nodename on Netware (Guenter
   Knauf)
-- Fixed bug #38091 (Mail() does not use FQDN when sending SMTP helo). 
+- Fixed bug #38091 (Mail() does not use FQDN when sending SMTP helo).
   (Kalle, Rick Yorgason)
 - Fixed bug #28038 (Sent incorrect RCPT TO commands to SMTP server) (Garrett)
-- Fixed bug #27051 (Impersonation with FastCGI does not exec process as 
+- Fixed bug #27051 (Impersonation with FastCGI does not exec process as
   impersonated user). (Pierre)
 
 
@@ -3518,17 +3844,17 @@ PHP                                                                        NEWS
     value. (Hannes)
 
 - Improved Windows support:
-  . Update all libraries to their latest stable version. (Pierre, Rob, Liz, 
+  . Update all libraries to their latest stable version. (Pierre, Rob, Liz,
     Garrett).
   . Added Windows support for stat(), touch(), filemtime(), filesize() and
     related functions. (Pierre)
   . Re-added socket_create_pair() for Windows in sockets extension. (Kalle)
-  . Added inet_pton() and inet_ntop() also for Windows platforms. 
+  . Added inet_pton() and inet_ntop() also for Windows platforms.
     (Kalle, Pierre)
   . Added mcrypt_create_iv() for Windows platforms. (Pierre)
   . Added ACL Cache support on Windows.
     (Kanwaljeet Singla, Pierre, Venkat Raman Don)
-  . Added constants based on Windows' GetVersionEx information. 
+  . Added constants based on Windows' GetVersionEx information.
     PHP_WINDOWS_VERSION_* and PHP_WINDOWS_NT_*. (Pierre)
   . Added support for ACL (is_writable, is_readable, reports now correct
     results) on Windows. (Pierre, Venkat Raman Don, Kanwaljeet Singla)
@@ -3716,7 +4042,7 @@ PHP                                                                        NEWS
     DateInterval on each iteration, up to an end date or limited by maximum
     number of occurences.
 
-- Added compatibility mode in GD, imagerotate, image(filled)ellipse 
+- Added compatibility mode in GD, imagerotate, image(filled)ellipse
   imagefilter, imageconvolution and imagecolormatch are now always enabled.
   (Pierre)
 - Added array_replace() and array_replace_recursive() functions. (Matt)
@@ -3758,12 +4084,12 @@ PHP                                                                        NEWS
 - Added support for CP850 encoding in mbstring extension.
   (Denis Giffeler, Moriyoshi)
 - Added stream_cast() and stream_set_options() to user-space stream wrappers,
-  allowing stream_select(), stream_set_blocking(), stream_set_timeout() and 
+  allowing stream_select(), stream_set_blocking(), stream_set_timeout() and
   stream_set_write_buffer() to work with user-space stream wrappers. (Arnaud)
 - Added header_remove() function. (chsc at peytz dot dk, Arnaud)
 - Added stream_context_get_params() function. (Arnaud)
 - Added optional parameter "new" to sybase_connect(). (Timm)
-- Added parse_ini_string() function. (grange at lemonde dot fr, Arnaud) 
+- Added parse_ini_string() function. (grange at lemonde dot fr, Arnaud)
 - Added str_getcsv() function. (Sara)
 - Added openssl_random_pseudo_bytes() function. (Scott)
 - Added ability to send user defined HTTP headers with SOAP request.
@@ -3840,7 +4166,7 @@ PHP                                                                        NEWS
   prepending functions). (Scott)
 - Fixed bug #48215 (Calling a method with the same name as the parent class
   calls the constructor). (Scott)
-- Fixed bug #48200 (compile failure with mbstring.c when 
+- Fixed bug #48200 (compile failure with mbstring.c when
   --enable-zend-multibyte is used). (Jani)
 - Fixed bug #48188 (Cannot execute a scrollable cursors twice with PDO_PGSQL).
   (Matteo)
@@ -3972,7 +4298,7 @@ PHP                                                                        NEWS
 - Fixed bug #46042 (memory leaks with reflection of mb_convert_encoding()).
   (Ilia)
 - Fixed bug #46039 (ArrayObject iteration is slow). (Arnaud)
-- Fixed bug #46033 (Direct instantiation of SQLite3stmt and SQLite3result cause 
+- Fixed bug #46033 (Direct instantiation of SQLite3stmt and SQLite3result cause
   a segfault.) (Scott)
 - Fixed bug #45991 (Ini files with the UTF-8 BOM are treated as invalid).
   (Scott)
@@ -4048,7 +4374,7 @@ PHP                                                                        NEWS
 - Added support for Sun CC (FR #46595 and FR #46513). (David Soria Parra)
 
 - Changed default value of array_unique()'s optional sorting type parameter
-  back to SORT_STRING to fix backwards compatibility breakage introduced in 
+  back to SORT_STRING to fix backwards compatibility breakage introduced in
   PHP 5.2.9. (Moriyoshi)
 
 - Fixed memory corruptions while reading properties of zip files. (Ilia)
@@ -4081,7 +4407,7 @@ PHP                                                                        NEWS
   files). (Pierre)
 - Fixed bug #48359 (Script hangs on snmprealwalk if OID is not increasing).
   (Ilia, simonov at gmail dot com)
-- Fixed bug #48336 (ReflectionProperty::getDeclaringClass() does not work 
+- Fixed bug #48336 (ReflectionProperty::getDeclaringClass() does not work
   with redeclared property).
   (patch by Markus dot Lidel at shadowconnect dot com)
 - Fixed bug #48326 (constant MSG_DONTWAIT not defined). (Arnaud)
@@ -4126,7 +4452,7 @@ PHP                                                                        NEWS
 - Fixed bug #47969 (ezmlm_hash() returns different values depend on OS). (Ilia)
 - Fixed bug #47946 (ImageConvolution overwrites background). (Ilia)
 - Fixed bug #47940 (memory leaks in imap_body). (Pierre, Jake Levitt)
-- Fixed bug #47937 (system() calls sapi_flush() regardless of output 
+- Fixed bug #47937 (system() calls sapi_flush() regardless of output
   buffering). (Ilia)
 - Fixed bug #47903 ("@" operator does not work with string offsets). (Felipe)
 - Fixed bug #47893 (CLI aborts on non blocking stdout). (Arnaud)
@@ -4200,7 +4526,7 @@ PHP                                                                        NEWS
 - Fixed bug #45092 (header HTTP context option not being used when compiled
   using --with-curlwrappers). (Jani)
 - Fixed bug #44996 (xmlrpc_decode() ignores time zone on iso8601.datetime).
-  (Ilia, kawai at apache dot org) 
+  (Ilia, kawai at apache dot org)
 - Fixed bug #44827 (define() is missing error checks for class constants).
   (Ilia)
 - Fixed bug #44214 (Crash using preg_replace_callback() and global variables).
@@ -4225,7 +4551,7 @@ PHP                                                                        NEWS
 - Added optional sorting type flag parameter to array_unique(). Default is
   SORT_REGULAR. (Andrei)
 
-- Fixed a crash on extract in zip when files or directories entry names contain 
+- Fixed a crash on extract in zip when files or directories entry names contain
   a relative path. (Pierre)
 - Fixed error conditions handling in stream_filter_append(). (Arnaud)
 - Fixed zip filename property read. (Pierre)
@@ -4327,11 +4653,11 @@ PHP                                                                        NEWS
 - Added logging option for error_log to send directly to SAPI. (Stas)
 - Added PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION,
   PHP_EXTRA_VERSION, PHP_VERSION_ID, PHP_ZTS and PHP_DEBUG constants. (Pierre)
-- Added "PHP_INI_SCAN_DIR" environment variable which can be used to 
+- Added "PHP_INI_SCAN_DIR" environment variable which can be used to
   either disable or change the compile time ini scan directory (FR #45114).
   (Jani)
 
-- Fixed missing initialization of BG(page_uid) and BG(page_gid), 
+- Fixed missing initialization of BG(page_uid) and BG(page_gid),
   reported by Maksymilian Arciemowicz. (Stas)
 - Fixed memory leak inside sqlite_create_aggregate(). (Felipe)
 - Fixed memory leak inside PDO sqlite's sqliteCreateAggregate() method.
@@ -4347,7 +4673,7 @@ PHP                                                                        NEWS
 - Fixed a bug inside dba_replace() that could cause file truncation
   withinvalid keys. (Ilia)
 - Fixed memory leak inside readline_callback_handler_install() function.(Ilia)
-- Fixed memory leak inside readline_completion_function() function. (Felipe) 
+- Fixed memory leak inside readline_completion_function() function. (Felipe)
 - Fixed stream_get_contents() when using $maxlength and socket is notclosed.
   indeyets [at] php [dot] net on #46049. (Arnaud)
 - Fixed stream_get_line() to behave as documented on non-blocking streams.
@@ -4476,7 +4802,7 @@ PHP                                                                        NEWS
 - Fixed bug #45765 (ReflectionObject with default parameters of self::xxx cause
   an error). (Felipe)
 - Fixed bug #45751 (Using auto_prepend_file crashes (out of scope stack address
-  use)). (basant dot kukreja at sun dot com) 
+  use)). (basant dot kukreja at sun dot com)
 - Fixed bug #45722 (mb_check_encoding() crashes). (Moriyoshi)
 - Fixed bug #45705 (rfc822_parse_adrlist() modifies passed address parameter).
   (Jani)
@@ -4626,7 +4952,7 @@ PHP                                                                        NEWS
 
 01 May 2008, PHP 5.2.6
 - Fixed two possible crashes inside posix extension (Tony)
-- Fixed incorrect heredoc handling when label is used within the block. 
+- Fixed incorrect heredoc handling when label is used within the block.
   (Matt)
 - Fixed possible stack buffer overflow in FastCGI SAPI. (Andrei Nigmatulin)
 - Fixed sending of uninitialized paddings which may contain some information. (Andrei Nigmatulin)
diff --git a/README.GIT-RULES b/README.GIT-RULES
index 289a4e743..6e90aa97b 100644
--- a/README.GIT-RULES
+++ b/README.GIT-RULES
@@ -45,14 +45,17 @@ Currently we have the following branches in use::
 
   master    The active development branch. 
 
-  PHP-5.4   Is used to release the PHP 5.4.x series. It still allows for
-            larger enhancements.
+  PHP-5.5   Is used to release the PHP 5.5.x series. This is a current
+            stable version and is open for bugfixes only.
 
-  PHP-5.3   Is used to release the PHP 5.3.x series. This is current 
+  PHP-5.4   Is used to release the PHP 5.4.x series. This is a current
             stable version and is open for bugfixes only.
 
-  PHP-5.2   Is used to release the PHP 5.2.x series. It is closed for 
-            changes now.
+  PHP-5.3   Is used to release the PHP 5.3.x series. This is currently 
+            in extended support and open forsecurity fixes only. Triaged
+            via security@php.net
+
+  PHP-5.2   This branch is closed.
 
   PHP-5.1   This branch is closed.
 
diff --git a/README.PARAMETER_PARSING_API b/README.PARAMETER_PARSING_API
index 927e48188..4579340e5 100644
--- a/README.PARAMETER_PARSING_API
+++ b/README.PARAMETER_PARSING_API
@@ -32,7 +32,7 @@ resources cannot be auto-converted.
 Type specifiers
 ---------------
  The following list shows the type specifier, its meaning and the parameter 
- types that need to be passed by address. All passed paramaters are set
+ types that need to be passed by address. All passed parameters are set
  if the PHP parameter is non optional and untouched if optional and the 
  parameter is not present. The only exception is O where the zend_class_entry*
  has to be provided on input and is used to verify the PHP parameter is an 
diff --git a/README.TESTING b/README.TESTING
index 75141d50e..5e0ee11be 100644
--- a/README.TESTING
+++ b/README.TESTING
@@ -1,6 +1,6 @@
 [IMPORTANT NOTICE]
 ------------------
- Failed tests usualy indicate a problem with your local system setup
+ Failed tests usually indicate a problem with your local system setup
 and not within PHP itself (at least for official PHP release versions).
 You may decide to automaticaly submit a test summary to our QA workflow
 at the end of a test run.
diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c
index 0ced6db45..2ec97be01 100644
--- a/TSRM/tsrm_win32.c
+++ b/TSRM/tsrm_win32.c
@@ -625,7 +625,7 @@ TSRM_API int shmget(int key, int size, int flags)
 	shm->info	 = info_handle;
 	shm->descriptor = MapViewOfFileEx(shm->info, FILE_MAP_ALL_ACCESS, 0, 0, 0, NULL);
 
-	if (created) {
+	if (NULL != shm->descriptor && created) {
 		shm->descriptor->shm_perm.key	= key;
 		shm->descriptor->shm_segsz		= size;
 		shm->descriptor->shm_ctime		= time(NULL);
@@ -639,8 +639,10 @@ TSRM_API int shmget(int key, int size, int flags)
 		shm->descriptor->shm_perm.mode	= shm->descriptor->shm_perm.seq	= 0;
 	}
 
-	if (shm->descriptor->shm_perm.key != key || size > shm->descriptor->shm_segsz ) {
-		CloseHandle(shm->segment);
+	if (NULL != shm->descriptor && (shm->descriptor->shm_perm.key != key || size > shm->descriptor->shm_segsz)) {
+		if (NULL != shm->segment) {
+			CloseHandle(shm->segment);
+		}
 		UnmapViewOfFile(shm->descriptor);
 		CloseHandle(shm->info);
 		return -1;
diff --git a/UPGRADING b/UPGRADING
index 0293a6a66..e6f582a4a 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -640,6 +640,9 @@ c. New functions
   - SPL
     - class_uses()
 
+  - SplFixedArray
+    - SplFixedArray::__wakeup() (5.4.18)
+
 d. New global constants
 
   - CURLOPT_MAX_RECV_SPEED_LARGE
diff --git a/Zend/README.ZEND_VM b/Zend/README.ZEND_VM
index 15ff6fd86..de66110d6 100644
--- a/Zend/README.ZEND_VM
+++ b/Zend/README.ZEND_VM
@@ -6,7 +6,7 @@ fields and using different execution methods (call threading, switch threading
 and direct threading). As a result ZE2 got more than 20% speedup on raw PHP
 code execution (with specialized executor and direct threading execution
 method). As in most PHP applications raw execution speed isn't the limiting
-factor but system calls and database callls are, your mileage with this patch
+factor but system calls and database calls are, your mileage with this patch
 will vary.
 
 Most parts of the old zend_execute.c go into zend_vm_def.h. Here you can
diff --git a/Zend/ZEND_CHANGES b/Zend/ZEND_CHANGES
index 5208ce162..afb359559 100644
--- a/Zend/ZEND_CHANGES
+++ b/Zend/ZEND_CHANGES
@@ -435,7 +435,7 @@ Changes in the Zend Engine 2.0
       that of other object-oriented languages, such as Java: When the
       last reference to an object is destroyed the object's
       destructor, which is a class method name __destruct() that
-      recieves no parameters, is called before the object is freed
+      receives no parameters, is called before the object is freed
       from memory.
 
       Example:
@@ -1136,7 +1136,7 @@ Changes in the Zend Engine 1.0
       (supports breakpoints, expression evaluation, step-in/over,
       function call backtrace, and more).
 
-  The Zend Engine claims 100% compatability with the engine of PHP
+  The Zend Engine claims 100% compatibility with the engine of PHP
   3.0, and is shamelessly lying about it. Here's why:
 
     * Static variable initializers only accept scalar values
@@ -1161,6 +1161,6 @@ Changes in the Zend Engine 1.0
       printed the letter { and the contents of the variable $somevar in
       PHP 3.0), it will result in a parse error with the Zend Engine.
       In this case, you would have to change the code to print
-      "\{$somevar"; This incompatability is due to the full variable
+      "\{$somevar"; This incompatibility is due to the full variable
       reference within quoted strings feature added in the Zend
       Engine.
diff --git a/Zend/acinclude.m4 b/Zend/acinclude.m4
index 136d2d8be..77430aba7 100644
--- a/Zend/acinclude.m4
+++ b/Zend/acinclude.m4
@@ -4,7 +4,7 @@ dnl This file contains local autoconf functions.
 
 AC_DEFUN([LIBZEND_BISON_CHECK],[
   # we only support certain bison versions
-  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2"
+  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2 2.6.4"
 
   # for standalone build of Zend Engine
   test -z "$SED" && SED=sed
diff --git a/Zend/tests/019.phpt b/Zend/tests/019.phpt
index 70093cd28..654f86bb1 100644
--- a/Zend/tests/019.phpt
+++ b/Zend/tests/019.phpt
@@ -357,7 +357,7 @@ var_dump($global_var);
 test_unset3();
 var_dump($global_var);
 
-//Note: No error conditions relating to passing arugments can be tested
+//Note: No error conditions relating to passing arguments can be tested
 // because these are not functions but statements, it will result in syntax error.
 ?>
 ===DONE===
diff --git a/Zend/tests/bug32428.phpt b/Zend/tests/bug32428.phpt
index 0b5ca6aeb..e75148fec 100644
--- a/Zend/tests/bug32428.phpt
+++ b/Zend/tests/bug32428.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #32428 (The @ warning error supression operator is broken)
+Bug #32428 (The @ warning error suppression operator is broken)
 --FILE--
 <?php 
   $data = @$not_exists; 
diff --git a/Zend/tests/bug60598.phpt b/Zend/tests/bug60598.phpt
new file mode 100644
index 000000000..eeee75a19
--- /dev/null
+++ b/Zend/tests/bug60598.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Bug #60598 (cli/apache sapi segfault on objects manipulation)
+--FILE--
+<?php
+define('OBJECT_COUNT', 10000);
+
+$containers = array();
+
+class Object {
+    protected $_guid = 0;
+    public function __construct() {
+		global $containers;
+		$this->guid = 1;
+        $containers[spl_object_hash($this)] = $this;
+    }
+    public function __destruct() {
+		global $containers;
+        $containers[spl_object_hash($this)] = NULL;
+    }
+}
+
+for ($i = 0; $i < OBJECT_COUNT; ++$i) {
+    new Object();
+}
+
+// You probably won't see this because of the "zend_mm_heap corrupted"
+?>
+If you see this, try to increase OBJECT_COUNT to 100,000
+--EXPECT--
+If you see this, try to increase OBJECT_COUNT to 100,000
diff --git a/Zend/tests/bug60771.phpt b/Zend/tests/bug60771.phpt
index c20bbc462..119ae50ad 100644
--- a/Zend/tests/bug60771.phpt
+++ b/Zend/tests/bug60771.phpt
@@ -1,10 +1,10 @@
---TEST--

-test of larger than 8kb text file being parsed by require statement

---FILE--

-<?php

- file_put_contents('test.php',str_repeat('passed, ',1024));

- require('test.php');

- unlink('test.php');

-?>

---EXPECT--

-passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 

+--TEST--
+test of larger than 8kb text file being parsed by require statement
+--FILE--
+<?php
+ file_put_contents('test.php',str_repeat('passed, ',1024));
+ require('./test.php');
+ unlink('test.php');
+?>
+--EXPECT--
+passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, passed, 
diff --git a/Zend/tests/bug64660.phpt b/Zend/tests/bug64660.phpt
new file mode 100644
index 000000000..e2b89da1c
--- /dev/null
+++ b/Zend/tests/bug64660.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Bug #64660 (Segfault on memory exhaustion within function definition)
+--FILE--
+<?php
+function a() {
+        [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]
+}
+echo "Done\n";
+--EXPECTF--
+
+Parse error: memory exhausted in %s on line %d 
diff --git a/Zend/tests/bug64720.phpt b/Zend/tests/bug64720.phpt
new file mode 100644
index 000000000..6c33165bb
--- /dev/null
+++ b/Zend/tests/bug64720.phpt
@@ -0,0 +1,48 @@
+--TEST--
+Bug #64720 (SegFault on zend_deactivate)
+--FILE--
+<?php
+class Stat {
+    private static $requests;
+    public static function getInstance() {
+        if (!isset(self::$requests[1])) {
+            self::$requests[1] = new self();
+        }
+        return self::$requests[1];
+    }
+    
+    public function __destruct() {
+        unset(self::$requests[1]);
+    }
+}
+
+class Foo {
+    public function __construct() {
+        Stat::getInstance();
+    }
+}
+
+class Error {
+    private $trace;
+    public function __construct() {
+        $this->trace = debug_backtrace(1);
+    }
+}
+
+class Bar {
+    public function __destruct() {
+        Stat::getInstance();
+        new Error();
+    }
+
+    public function test() {
+        new Error();
+    }
+}
+
+$foo = new Foo();
+$bar = new Bar();
+$bar->test();
+?>
+--EXPECTF--
+Fatal error: Access to undeclared static property: Stat::$requests in %sbug64720.php on line 12
diff --git a/Zend/tests/bug64821.1.phpt b/Zend/tests/bug64821.1.phpt
new file mode 100644
index 000000000..5e2093c47
--- /dev/null
+++ b/Zend/tests/bug64821.1.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Bug #64821 Custom Exceptions crash when internal properties overridden (variation 1)
+--FILE--
+<?php
+
+class a extends exception {
+	public function __construct() {
+		$this->message = NULL;
+		$this->string  = NULL;
+		$this->code    = array();
+		$this->line = "hello";
+	}
+}
+
+throw new a;
+
+?>
+--EXPECTF--
+Fatal error: Uncaught exception 'a' in %s:0
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/bug64821.2.phpt b/Zend/tests/bug64821.2.phpt
new file mode 100644
index 000000000..91a43f500
--- /dev/null
+++ b/Zend/tests/bug64821.2.phpt
@@ -0,0 +1,19 @@
+--TEST--
+Bug #64821 Custom Exceptions crash when internal properties overridden (variation 2)
+--FILE--
+<?php
+
+class a extends exception {
+	public function __construct() {
+		$this->line = array();
+	}
+}
+
+throw new a;
+
+?>
+--EXPECTF--
+Fatal error: Uncaught exception 'a' in %s:0
+Stack trace:
+#0 {main}
+  thrown in %s on line %d
diff --git a/Zend/tests/bug64821.3.phpt b/Zend/tests/bug64821.3.phpt
new file mode 100644
index 000000000..9e96075d4
--- /dev/null
+++ b/Zend/tests/bug64821.3.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Bug #64821 Custom Exceptions crash when internal properties overridden (variation 3)
+--FILE--
+<?php
+
+class a extends exception {
+	public function __construct() {
+		$this->line = array();
+		$this->file = NULL;
+	}
+}
+
+throw new a;
+
+?>
+--EXPECTF--
+Fatal error: Uncaught exception 'a' in :0
+Stack trace:
+#0 {main}
+  thrown in Unknown on line %d
diff --git a/Zend/tests/bug64896.phpt b/Zend/tests/bug64896.phpt
new file mode 100644
index 000000000..3e955bbec
--- /dev/null
+++ b/Zend/tests/bug64896.phpt
@@ -0,0 +1,47 @@
+--TEST--
+Bug #64896 (Segfault with gc_collect_cycles using unserialize on certain objects)
+--XFAIL--
+We can not fix this bug without a significant (performace slow down) change to gc
+--FILE--
+<?php
+$bar = NULL;
+class bad
+{
+	private $_private = array();
+
+	public function __construct()
+	{
+		$this->_private[] = 'php';
+	}
+
+	public function __destruct()
+	{
+		global $bar;
+		$bar = $this;
+	}
+}
+
+$foo = new stdclass;
+$foo->foo = $foo;
+$foo->bad = new bad;
+
+gc_disable();
+
+unserialize(serialize($foo));
+gc_collect_cycles();
+var_dump($bar); 
+/*  will output:
+object(bad)#4 (1) {
+  ["_private":"bad":private]=>
+  &UNKNOWN:0
+}
+*/
+?>
+--EXPECTF--
+bject(bad)#%d (1) {
+  ["_private":"bad":private]=>
+  array(1) {
+    [0]=>
+    string(3) "php"
+  }
+}
diff --git a/Zend/tests/bug64960.phpt b/Zend/tests/bug64960.phpt
new file mode 100644
index 000000000..b31cca3dc
--- /dev/null
+++ b/Zend/tests/bug64960.phpt
@@ -0,0 +1,40 @@
+--TEST--
+Bug #64960 (Segfault in gc_zval_possible_root)
+--FILE--
+<?php
+// this makes ob_end_clean raise an error
+ob_end_flush();
+
+class ExceptionHandler {
+	public function __invoke (Exception $e)
+	{
+		// this triggers the custom error handler
+		ob_end_clean();
+	}
+}
+
+// this must be a class, closure does not trigger segfault
+set_exception_handler(new ExceptionHandler());
+
+// exception must be throwed from error handler.
+set_error_handler(function()
+{
+	$e = new Exception;
+	$e->_trace = debug_backtrace();
+	
+	throw $e;
+});
+
+// trigger error handler
+$a['waa'];
+?>
+--EXPECTF--
+Notice: ob_end_flush(): failed to delete and flush buffer. No buffer to delete or flush in %sbug64960.php on line 3
+
+Fatal error: Uncaught exception 'Exception' in %sbug64960.php:19
+Stack trace:
+#0 [internal function]: {closure}(8, 'ob_end_clean():...', '%s', 9, Array)
+#1 %sbug64960.php(9): ob_end_clean()
+#2 [internal function]: ExceptionHandler->__invoke(Object(Exception))
+#3 {main}
+  thrown in %sbug64960.php on line 19
diff --git a/Zend/tests/bug64966.phpt b/Zend/tests/bug64966.phpt
new file mode 100644
index 000000000..c1cdbbf81
--- /dev/null
+++ b/Zend/tests/bug64966.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Bug #64966 (segfault in zend_do_fcall_common_helper_SPEC)
+--FILE--
+<?php
+error_reporting(E_ALL);
+set_error_handler(function($error) { throw new Exception(); }, E_RECOVERABLE_ERROR);
+
+function test($func) {
+	$a = $func("");
+	return true;
+}
+class A {
+	public function b() {
+		test("strlen");
+		test("iterator_apply");
+	}
+}
+
+$a = new A();
+$a->b();
+?>
+--EXPECTF--
+Fatal error: Uncaught exception 'Exception' in %sbug64966.php:3
+Stack trace:
+#0 [internal function]: {closure}(4096, 'Argument 1 pass...', '%s', 6, Array)
+#1 %sbug64966.php(6): iterator_apply('')
+#2 %sbug64966.php(12): test('iterator_apply')
+#3 %sbug64966.php(17): A->b()
+#4 {main}
+  thrown in %sbug64966.php on line 3
diff --git a/Zend/tests/bug64988.phpt b/Zend/tests/bug64988.phpt
new file mode 100644
index 000000000..34fd482f3
--- /dev/null
+++ b/Zend/tests/bug64988.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Bug #64988 (Class loading order affects E_STRICT warning)
+--FILE--
+<?php
+abstract class Base1 {
+	public function insert(array $data){
+		return array_reverse($data);
+	}
+}
+
+class Noisy1 extends Base1 {
+	public function insert(array $data, $option1 = Null) {
+		if (!empty($option1)) {
+			$data['option1'] = $option1;
+		}
+		return parent::insert($data);
+	}
+}
+class Smooth1 extends Noisy1 {
+	public function insert(array $data) {
+		return parent::insert($data, count($data));
+	}
+}
+
+$o = new Smooth1();
+echo "okey";
+?>
+--EXPECTF--
+Strict Standards: Declaration of Smooth1::insert() should be compatible with Noisy1::insert(array $data, $option1 = NULL) in %sbug64988.php on line 20
+okey
diff --git a/Zend/tests/bug65108.phpt b/Zend/tests/bug65108.phpt
new file mode 100644
index 000000000..d3e5a65b2
--- /dev/null
+++ b/Zend/tests/bug65108.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Bug #65108 (is_callable() triggers Fatal Error)
+--FILE--
+<?php
+class C {
+	private function f() {}
+	static function __callStatic($name, $args) {}
+}
+
+class B {
+	public function B() {
+		$isCallable = is_callable(array(new C, 'f'));
+		var_dump($isCallable);
+	}
+}
+
+new B();
+
+Class E {
+   private function f() {}
+   function __call($name, $args) {}
+}
+$isCallable = is_callable(array('E', 'f'));
+var_dump($isCallable);
+--EXPECT--
+bool(false)
+bool(false)
diff --git a/Zend/tests/bug65254.phpt b/Zend/tests/bug65254.phpt
new file mode 100644
index 000000000..d2ebba4d9
--- /dev/null
+++ b/Zend/tests/bug65254.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Bug #65254 (Exception not catchable when exception thrown in autoload with a namespace)
+--FILE--
+<?php
+function __autoload($class)
+{
+    eval("namespace ns_test; class test {}");
+
+    throw new \Exception('abcd');
+}
+
+try
+{
+    \ns_test\test::go();
+}
+catch (Exception $e)
+{
+    echo 'caught';
+}
+--EXPECT--
+caught
diff --git a/Zend/tests/bug65291.phpt b/Zend/tests/bug65291.phpt
new file mode 100644
index 000000000..7bc76331c
--- /dev/null
+++ b/Zend/tests/bug65291.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Bug #65291 - get_defined_constants() causes PHP to crash in a very limited case.
+--FILE--
+<?php
+
+trait TestTrait
+{
+	public static function testStaticFunction()
+	{
+		return __CLASS__;
+	}
+}
+class Tester
+{
+	use TestTrait;
+}
+
+$foo = Tester::testStaticFunction();
+get_defined_constants();
+get_defined_constants(true);
+
+echo $foo;
+?>
+--EXPECT--
+Tester
diff --git a/Zend/tests/bug65322.phpt b/Zend/tests/bug65322.phpt
new file mode 100644
index 000000000..aab163d91
--- /dev/null
+++ b/Zend/tests/bug65322.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Bug #65322: compile time errors won't trigger auto loading
+--FILE--
+<?php
+
+spl_autoload_register(function($class) {
+    var_dump($class);
+    class B {}
+});
+
+set_error_handler(function($_, $msg, $file) {
+    var_dump($msg, $file);
+    new B;
+});
+
+eval('class A { function a() {} function __construct() {} }');
+
+?>
+--EXPECTF--
+string(50) "Redefining already defined constructor for class A"
+string(%d) "%s(%d) : eval()'d code"
+string(1) "B"
diff --git a/Zend/tests/bug65372.phpt b/Zend/tests/bug65372.phpt
new file mode 100644
index 000000000..50fc2dbb1
--- /dev/null
+++ b/Zend/tests/bug65372.phpt
@@ -0,0 +1,40 @@
+--TEST--
+Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
+--FILE--
+<?php
+
+class ParentClass
+{
+    private static $_OBJECTS;
+
+    public static function Get()
+    {
+        self::$_OBJECTS[1] = new ChildClass();
+        return self::$_OBJECTS[1];    
+    }
+}
+
+class ChildClass extends ParentClass
+{
+    public $Manager;
+
+    function __construct()
+    {
+        $this->Manager = $this;
+    }
+
+    public static function &GetCurrent()
+    {
+        return ChildClass::Get();
+    }
+
+    public static function &Get()
+    {
+        return parent::Get();
+    }
+}
+
+$staff = ChildClass::GetCurrent();
+?>
+--EXPECTF--
+Notice: Only variable references should be returned by reference in %sbug65372.php on line 30
diff --git a/Zend/tests/bug65579.phpt b/Zend/tests/bug65579.phpt
new file mode 100644
index 000000000..25d74ed4f
--- /dev/null
+++ b/Zend/tests/bug65579.phpt
@@ -0,0 +1,29 @@
+--TEST--
+Bug #65579 (Using traits with get_class_methods causes segfault)
+--FILE--
+<?php
+trait ParentTrait {
+    public function testMethod() { }
+}
+
+trait ChildTrait {
+    use ParentTrait {
+        testMethod as testMethodFromParentTrait;
+    }
+    public function testMethod() { }
+}
+
+class TestClass {
+    use ChildTrait;
+}
+
+$obj = new TestClass();
+var_dump(get_class_methods($obj));
+?>
+--EXPECT--
+array(2) {
+  [0]=>
+  string(10) "testMethod"
+  [1]=>
+  string(25) "testmethodfromparenttrait"
+}
diff --git a/Zend/tests/closure_044.phpt b/Zend/tests/closure_044.phpt
index d2644c040..8fdef135d 100644
--- a/Zend/tests/closure_044.phpt
+++ b/Zend/tests/closure_044.phpt
@@ -3,7 +3,7 @@ Closure 044: Scope/bounding combination invariants; non static closures
 --FILE--
 <?php
 /* A non-static closure has a bound instance if it has a scope
- * and does't have an instance if it has no scope */
+ * and doesn't have an instance if it has no scope */
 
 $nonstaticUnscoped = function () { var_dump(isset(A::$priv)); var_dump(isset($this)); };
 
diff --git a/Zend/tests/errmsg_045.phpt b/Zend/tests/errmsg_045.phpt
new file mode 100644
index 000000000..b27f67ade
--- /dev/null
+++ b/Zend/tests/errmsg_045.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Error message in error handler during compilation
+--FILE--
+<?php
+
+set_error_handler(function($_, $msg, $file) {
+	var_dump($msg, $file);
+	echo $undefined;
+});
+
+eval('class A { function a() {} function __construct() {} }');
+
+?>
+--EXPECTF--
+string(50) "Redefining already defined constructor for class A"
+string(%d) "%s(%d) : eval()'d code"
+
+Notice: Undefined variable: undefined in %s on line %d
diff --git a/Zend/tests/gc_007.phpt b/Zend/tests/gc_007.phpt
index 8601ea43b..a018e4846 100644
--- a/Zend/tests/gc_007.phpt
+++ b/Zend/tests/gc_007.phpt
@@ -1,5 +1,5 @@
 --TEST--
-GC 007: Unreferensed array cycle
+GC 007: Unreferenced array cycle
 --INI--
 zend.enable_gc=1
 --FILE--
diff --git a/Zend/tests/gc_008.phpt b/Zend/tests/gc_008.phpt
index 289d581d6..4e27e5b70 100644
--- a/Zend/tests/gc_008.phpt
+++ b/Zend/tests/gc_008.phpt
@@ -1,5 +1,5 @@
 --TEST--
-GC 008: Unreferensed object cycle
+GC 008: Unreferenced object cycle
 --INI--
 zend.enable_gc=1
 --FILE--
diff --git a/Zend/tests/gc_009.phpt b/Zend/tests/gc_009.phpt
index 263d31f45..3f4657d2e 100644
--- a/Zend/tests/gc_009.phpt
+++ b/Zend/tests/gc_009.phpt
@@ -1,5 +1,5 @@
 --TEST--
-GC 009: Unreferensed array-object cycle
+GC 009: Unreferenced array-object cycle
 --INI--
 zend.enable_gc=1
 --FILE--
diff --git a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt
index fc09a367b..0bbea1100 100644
--- a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt
+++ b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Overridding Conflicting Methods should not result in a notice/warning about collisions
+Overriding Conflicting Methods should not result in a notice/warning about collisions
 --FILE--
 <?php
 error_reporting(E_ALL);
diff --git a/Zend/zend.c b/Zend/zend.c
index fc443d95b..0602c4504 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -1091,17 +1091,19 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
 		error_filename = "Unknown";
 	}
 
-	va_start(args, format);
-
 #ifdef HAVE_DTRACE
 	if(DTRACE_ERROR_ENABLED()) {
 		char *dtrace_error_buffer;
+		va_start(args, format);
 		zend_vspprintf(&dtrace_error_buffer, 0, format, args);
-		DTRACE_ERROR(dtrace_error_buffer, error_filename, error_lineno);
+		DTRACE_ERROR(dtrace_error_buffer, (char *)error_filename, error_lineno);
 		efree(dtrace_error_buffer);
+		va_end(args);
 	}
 #endif /* HAVE_DTRACE */
 
+	va_start(args, format);
+
 	/* if we don't have a user defined error handler */
 	if (!EG(user_error_handler)
 		|| !(EG(user_error_handler_error_reporting) & type)
@@ -1181,7 +1183,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
 			 * such scripts recursivly, but some CG() variables may be
 			 * inconsistent. */
 
-			in_compilation = zend_is_compiling(TSRMLS_C);
+			in_compilation = CG(in_compilation);
 			if (in_compilation) {
 				saved_class_entry = CG(active_class_entry);
 				CG(active_class_entry) = NULL;
@@ -1193,6 +1195,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
 				SAVE_STACK(declare_stack);
 				SAVE_STACK(list_stack);
 				SAVE_STACK(context_stack);
+				CG(in_compilation) = 0;
 			}
 
 			if (call_user_function_ex(CG(function_table), NULL, orig_user_error_handler, &retval, 5, params, 1, NULL TSRMLS_CC) == SUCCESS) {
@@ -1217,6 +1220,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
 				RESTORE_STACK(declare_stack);
 				RESTORE_STACK(list_stack);
 				RESTORE_STACK(context_stack);
+				CG(in_compilation) = 1;
 			}
 
 			if (!EG(user_error_handler)) {
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 529092ab9..125a1a256 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1143,7 +1143,7 @@ ZEND_API void object_properties_init(zend_object *object, zend_class_entry *clas
 
 /* This function requires 'properties' to contain all props declared in the
  * class and all props being public. If only a subset is given or the class
- * has protected members then you need to merge the properties seperately by
+ * has protected members then you need to merge the properties separately by
  * calling zend_merge_properties(). */
 ZEND_API int _object_and_properties_init(zval *arg, zend_class_entry *class_type, HashTable *properties ZEND_FILE_LINE_DC TSRMLS_DC) /* {{{ */
 {
@@ -2514,7 +2514,12 @@ ZEND_API int zend_register_class_alias_ex(const char *name, int name_len, zend_c
 	char *lcname = zend_str_tolower_dup(name, name_len);
 	int ret;
 
-	ret = zend_hash_add(CG(class_table), lcname, name_len+1, &ce, sizeof(zend_class_entry *), NULL);
+	if (lcname[0] == '\\') {
+		ret = zend_hash_add(CG(class_table), lcname+1, name_len, &ce, sizeof(zend_class_entry *), NULL);
+	} else {
+		ret = zend_hash_add(CG(class_table), lcname, name_len+1, &ce, sizeof(zend_class_entry *), NULL);
+	}
+
 	efree(lcname);
 	if (ret == SUCCESS) {
 		ce->refcount++;
@@ -2779,8 +2784,8 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca
 		}
 		if ((check_flags & IS_CALLABLE_CHECK_NO_ACCESS) == 0 &&
 		    (fcc->calling_scope &&
-		     (fcc->calling_scope->__call ||
-		      fcc->calling_scope->__callstatic))) {
+		     ((fcc->object_ptr && fcc->calling_scope->__call) ||
+		      (!fcc->object_ptr && fcc->calling_scope->__callstatic)))) {
 			if (fcc->function_handler->op_array.fn_flags & ZEND_ACC_PRIVATE) {
 				if (!zend_check_private(fcc->function_handler, fcc->object_ptr ? Z_OBJCE_P(fcc->object_ptr) : EG(scope), lmname, mlen TSRMLS_CC)) {
 					retval = 0;
@@ -3917,15 +3922,16 @@ ZEND_API const char* zend_find_alias_name(zend_class_entry *ce, const char *name
 {
 	zend_trait_alias *alias, **alias_ptr;
 
-	alias_ptr = ce->trait_aliases;
-	alias = *alias_ptr;
-	while (alias) {
-		if (alias->alias_len == len &&
-		    !strncasecmp(name, alias->alias, alias->alias_len)) {
-			return alias->alias;
-		}
-		alias_ptr++;
+	if ((alias_ptr = ce->trait_aliases)) {
 		alias = *alias_ptr;
+		while (alias) {
+			if (alias->alias_len == len &&
+				!strncasecmp(name, alias->alias, alias->alias_len)) {
+				return alias->alias;
+			}
+			alias_ptr++;
+			alias = *alias_ptr;
+		}
 	}
 
 	return name;
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 62bf391ca..7b8b68d3b 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -90,7 +90,7 @@ typedef struct _zend_fcall_info_cache {
 #define ZEND_NS_RAW_FENTRY(ns, zend_name, name, arg_info, flags)	ZEND_RAW_FENTRY(ZEND_NS_NAME(ns, zend_name), name, arg_info, flags)
 #define ZEND_NS_RAW_NAMED_FE(ns, zend_name, name, arg_info)			ZEND_NS_RAW_FENTRY(ns, #zend_name, name, arg_info, 0)
 
-#define ZEND_NS_NAMED_FE(ns, zend_name, name, arg_info)	ZEND_NS_FENTRY(ns, #zend_name, name, arg_info, 0)
+#define ZEND_NS_NAMED_FE(ns, zend_name, name, arg_info)	ZEND_NS_FENTRY(ns, zend_name, name, arg_info, 0)
 #define ZEND_NS_FE(ns, name, arg_info)					ZEND_NS_FENTRY(ns, name, ZEND_FN(name), arg_info, 0)
 #define ZEND_NS_DEP_FE(ns, name, arg_info)				ZEND_NS_FENTRY(ns, name, ZEND_FN(name), arg_info, ZEND_ACC_DEPRECATED)
 #define ZEND_NS_FALIAS(ns, name, alias, arg_info)		ZEND_NS_FENTRY(ns, name, ZEND_FN(alias), arg_info, 0)
@@ -461,7 +461,7 @@ ZEND_API extern const zend_fcall_info_cache empty_fcall_info_cache;
  */
 ZEND_API int zend_fcall_info_init(zval *callable, uint check_flags, zend_fcall_info *fci, zend_fcall_info_cache *fcc, char **callable_name, char **error TSRMLS_DC);
 
-/** Clear argumens connected with zend_fcall_info *fci
+/** Clear arguments connected with zend_fcall_info *fci
  * If free_mem is not zero then the params array gets free'd as well
  */
 ZEND_API void zend_fcall_info_args_clear(zend_fcall_info *fci, int free_mem);
@@ -499,7 +499,7 @@ ZEND_API int zend_fcall_info_argv(zend_fcall_info *fci TSRMLS_DC, int argc, va_l
 ZEND_API int zend_fcall_info_argn(zend_fcall_info *fci TSRMLS_DC, int argc, ...);
 
 /** Call a function using information created by zend_fcall_info_init()/args().
- * If args is given then those replace the arguement info in fci is temporarily.
+ * If args is given then those replace the argument info in fci is temporarily.
  */
 ZEND_API int zend_fcall_info_call(zend_fcall_info *fci, zend_fcall_info_cache *fcc, zval **retval, zval *args TSRMLS_DC);
 
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 605e39646..596c2498b 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -672,7 +672,7 @@ static inline unsigned int zend_mm_high_bit(size_t _size)
 #elif defined(__GNUC__) && defined(__x86_64__)
 	unsigned long n;
 
-        __asm__("bsrq %1,%0\n\t" : "=r" (n) : "rm"  (_size));
+        __asm__("bsr %1,%0\n\t" : "=r" (n) : "rm"  (_size));
         return (unsigned int)n;
 #elif defined(_MSC_VER) && defined(_M_IX86)
 	__asm {
@@ -698,12 +698,12 @@ static inline unsigned int zend_mm_low_bit(size_t _size)
 #elif defined(__GNUC__) && defined(__x86_64__)
         unsigned long n;
 
-        __asm__("bsfq %1,%0\n\t" : "=r" (n) : "rm"  (_size));
+        __asm__("bsf %1,%0\n\t" : "=r" (n) : "rm"  (_size));
         return (unsigned int)n;
 #elif defined(_MSC_VER) && defined(_M_IX86)
 	__asm {
 		bsf eax, _size
-   }
+	}
 #else
 	static const int offset[16] = {4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0};
 	unsigned int n;
@@ -2461,7 +2461,7 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
 	size_t res = nmemb;
 	unsigned long overflow = 0;
 
-	__asm__ ("mull %3\n\taddl %4,%0\n\tadcl %1,%1"
+	__asm__ ("mull %3\n\taddl %4,%0\n\tadcl $0,%1"
 	     : "=&a"(res), "=&d" (overflow)
 	     : "%0"(res),
 	       "rm"(size),
@@ -2481,12 +2481,22 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
         size_t res = nmemb;
         unsigned long overflow = 0;
 
-        __asm__ ("mulq %3\n\taddq %4,%0\n\tadcq %1,%1"
+#ifdef __ILP32__ /* x32 */
+# define LP_SUFF "l"
+#else /* amd64 */
+# define LP_SUFF "q"
+#endif
+
+        __asm__ ("mul" LP_SUFF  " %3\n\t"
+                 "add %4,%0\n\t"
+                 "adc $0,%1"
              : "=&a"(res), "=&d" (overflow)
              : "%0"(res),
                "rm"(size),
                "rm"(offset));
 
+#undef LP_SUFF
+
         if (UNEXPECTED(overflow)) {
                 zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset);
                 return 0;
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index f29676bac..04f4ebec2 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -1399,15 +1399,8 @@ ZEND_FUNCTION(class_alias)
 		return;
 	}
 
-	if (!autoload) {
-		lc_name = do_alloca(class_name_len + 1, use_heap);
-		zend_str_tolower_copy(lc_name, class_name, class_name_len);
+	found = zend_lookup_class_ex(class_name, class_name_len, NULL, autoload, &ce TSRMLS_CC);
 	
-		found = zend_hash_find(EG(class_table), lc_name, class_name_len+1, (void **) &ce);
-		free_alloca(lc_name, use_heap);
-	} else {
-		found = zend_lookup_class(class_name, class_name_len, &ce TSRMLS_CC);
-	}
 	if (found == SUCCESS) {
 		if ((*ce)->type == ZEND_USER_CLASS) { 
 			if (zend_register_class_alias_ex(alias_name, alias_name_len, *ce TSRMLS_CC) == SUCCESS) {
@@ -1926,6 +1919,11 @@ static int add_constant_info(zend_constant *constant, void *arg TSRMLS_DC)
 	zval *name_array = (zval *)arg;
 	zval *const_val;
 
+	if (!constant->name) {
+		/* skip special constants */
+		return 0;
+	}
+
 	MAKE_STD_ZVAL(const_val);
 	*const_val = constant->value;
 	zval_copy_ctor(const_val);
@@ -1993,11 +1991,16 @@ ZEND_FUNCTION(get_defined_constants)
 		while (zend_hash_get_current_data_ex(EG(zend_constants), (void **) &val, &pos) != FAILURE) {
 			zval *const_val;
 
+			if (!val->name) {
+				/* skip special constants */
+				goto next_constant;
+			}
+
 			if (val->module_number == PHP_USER_CONSTANT) {
 				module_number = i;
 			} else if (val->module_number > i || val->module_number < 0) {
 				/* should not happen */
-				goto bad_module_id;
+				goto next_constant;
 			} else {
 				module_number = val->module_number;
 			}
@@ -2014,7 +2017,7 @@ ZEND_FUNCTION(get_defined_constants)
 			INIT_PZVAL(const_val);
 
 			add_assoc_zval_ex(modules[module_number], val->name, val->name_len, const_val);
-bad_module_id:
+next_constant:
 			zend_hash_move_forward_ex(EG(zend_constants), &pos);
 		}
 		efree(module_names);
@@ -2386,7 +2389,7 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int
 				MAKE_STD_ZVAL(arg_array);
 				array_init(arg_array);
 
-				/* include_filename always points to the last filename of the last last called-fuction.
+				/* include_filename always points to the last filename of the last last called-function.
 				   if we have called include in the frame above - this is the file we have included.
 				 */
 
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 82275ce62..326d4ef97 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1723,7 +1723,7 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
 	}
 
 	{
-		/* Push a seperator to the switch and foreach stacks */
+		/* Push a separator to the switch and foreach stacks */
 		zend_switch_entry switch_entry;
 
 		switch_entry.cond.op_type = IS_UNUSED;
@@ -1817,7 +1817,7 @@ void zend_do_end_function_declaration(const znode *function_token TSRMLS_DC) /*
 	CG(active_op_array) = function_token->u.op_array;
 
 
-	/* Pop the switch and foreach seperators */
+	/* Pop the switch and foreach separators */
 	zend_stack_del_top(&CG(switch_cond_stack));
 	zend_stack_del_top(&CG(foreach_copy_stack));
 }
@@ -2584,7 +2584,7 @@ static int generate_free_foreach_copy(const zend_op *foreach_copy TSRMLS_DC) /*
 {
 	zend_op *opline;
 
-	/* If we reach the seperator then stop applying the stack */
+	/* If we reach the separator then stop applying the stack */
 	if (foreach_copy->result_type == IS_UNUSED && foreach_copy->op1_type == IS_UNUSED) {
 		return 1;
 	}
@@ -3267,11 +3267,11 @@ static void do_inheritance_check_on_method(zend_function *child, zend_function *
 
 	if (child->common.prototype && (child->common.prototype->common.fn_flags & ZEND_ACC_ABSTRACT)) {
 		if (!zend_do_perform_implementation_check(child, child->common.prototype TSRMLS_CC)) {
-			zend_error(E_COMPILE_ERROR, "Declaration of %s::%s() must be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, zend_get_function_declaration(child->common.prototype? child->common.prototype : parent TSRMLS_CC)); 
+			zend_error(E_COMPILE_ERROR, "Declaration of %s::%s() must be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, zend_get_function_declaration(child->common.prototype TSRMLS_CC)); 
 		}
 	} else if (EG(error_reporting) & E_STRICT || EG(user_error_handler)) { /* Check E_STRICT (or custom error handler) before the check so that we save some time */
 		if (!zend_do_perform_implementation_check(child, parent TSRMLS_CC)) {
-			char *method_prototype = zend_get_function_declaration(child->common.prototype? child->common.prototype : parent TSRMLS_CC);
+			char *method_prototype = zend_get_function_declaration(parent TSRMLS_CC);
 			zend_error(E_STRICT, "Declaration of %s::%s() should be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, method_prototype); 
 			efree(method_prototype);
 		}
@@ -3744,7 +3744,7 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, const
 #endif
 		} else {
 			/* inherited members are overridden by members inserted by traits */
-			/* check whether the trait method fullfills the inheritance requirements */
+			/* check whether the trait method fulfills the inheritance requirements */
 			do_inheritance_check_on_method(fn, existing_fn TSRMLS_CC);
 		}
 	}
@@ -3911,7 +3911,7 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*
 				/** With the other traits, we are more permissive.
 					We do not give errors for those. This allows to be more
 					defensive in such definitions.
-					However, we want to make sure that the insteadof declartion
+					However, we want to make sure that the insteadof declaration
 					is consistent in itself.
 				 */
 				j = 0;
@@ -5479,7 +5479,7 @@ void zend_do_shell_exec(znode *result, const znode *cmd TSRMLS_DC) /* {{{ */
 			break;
 	}
 	SET_NODE(opline->op1, cmd);
-	opline->op2.opline_num = 0;
+	opline->op2.opline_num = 1;
 	opline->extended_value = ZEND_DO_FCALL;
 	SET_UNUSED(opline->op2);
 
@@ -6943,7 +6943,7 @@ ZEND_API size_t zend_dirname(char *path, size_t len)
 	}
 #elif defined(NETWARE)
 	/*
-	 * Find the first occurence of : from the left 
+	 * Find the first occurrence of : from the left
 	 * move the path pointer to the position just after :
 	 * increment the len_adjust to the length of path till colon character(inclusive)
 	 * If there is no character beyond : simple return len
diff --git a/Zend/zend_dtrace.c b/Zend/zend_dtrace.c
index 5b2d0d2df..65c019385 100644
--- a/Zend/zend_dtrace.c
+++ b/Zend/zend_dtrace.c
@@ -24,7 +24,7 @@
 
 #ifdef HAVE_DTRACE
 /* PHP DTrace probes {{{ */
-static inline char *dtrace_get_executed_filename(TSRMLS_D)
+static inline const char *dtrace_get_executed_filename(TSRMLS_D)
 {
 	if (EG(current_execute_data) && EG(current_execute_data)->op_array) {
 		return EG(current_execute_data)->op_array->filename;
@@ -36,9 +36,9 @@ static inline char *dtrace_get_executed_filename(TSRMLS_D)
 ZEND_API zend_op_array *dtrace_compile_file(zend_file_handle *file_handle, int type TSRMLS_DC)
 {
 	zend_op_array *res;
-	DTRACE_COMPILE_FILE_ENTRY(file_handle->opened_path, file_handle->filename);
+	DTRACE_COMPILE_FILE_ENTRY(file_handle->opened_path, (char *)file_handle->filename);
 	res = compile_file(file_handle, type TSRMLS_CC);
-	DTRACE_COMPILE_FILE_RETURN(file_handle->opened_path, file_handle->filename);
+	DTRACE_COMPILE_FILE_RETURN(file_handle->opened_path, (char *)file_handle->filename);
 
 	return res;
 }
@@ -47,7 +47,7 @@ ZEND_API zend_op_array *dtrace_compile_file(zend_file_handle *file_handle, int t
 ZEND_API void dtrace_execute(zend_op_array *op_array TSRMLS_DC)
 {
 	int lineno;
-	char *scope, *filename, *funcname, *classname;
+	const char *scope, *filename, *funcname, *classname;
 	scope = filename = funcname = classname = NULL;
 
 	/* we need filename and lineno for both execute and function probes */
@@ -58,48 +58,46 @@ ZEND_API void dtrace_execute(zend_op_array *op_array TSRMLS_DC)
 	}
 
 	if (DTRACE_FUNCTION_ENTRY_ENABLED() || DTRACE_FUNCTION_RETURN_ENABLED()) {
-		filename = dtrace_get_executed_filename(TSRMLS_C);
 		classname = get_active_class_name(&scope TSRMLS_CC);
 		funcname = get_active_function_name(TSRMLS_C);
-		lineno = zend_get_executed_lineno(TSRMLS_C);
 	}
 
 	if (DTRACE_EXECUTE_ENTRY_ENABLED()) {
-		DTRACE_EXECUTE_ENTRY(filename, lineno);
+		DTRACE_EXECUTE_ENTRY((char *)filename, lineno);
 	}
 
 	if (DTRACE_FUNCTION_ENTRY_ENABLED() && funcname != NULL) {
-		DTRACE_FUNCTION_ENTRY(funcname, filename, lineno, classname, scope);
+		DTRACE_FUNCTION_ENTRY((char *)funcname, (char *)filename, lineno, (char *)classname, (char *)scope);
 	}
 
 	execute(op_array TSRMLS_CC);
 
 	if (DTRACE_FUNCTION_RETURN_ENABLED() && funcname != NULL) {
-		DTRACE_FUNCTION_RETURN(funcname, filename, lineno, classname, scope);
+		DTRACE_FUNCTION_RETURN((char *)funcname, (char *)filename, lineno, (char *)classname, (char *)scope);
 	}
 
 	if (DTRACE_EXECUTE_RETURN_ENABLED()) {
-		DTRACE_EXECUTE_RETURN(filename, lineno);
+		DTRACE_EXECUTE_RETURN((char *)filename, lineno);
 	}
 }
 
 ZEND_API void dtrace_execute_internal(zend_execute_data *execute_data_ptr, int return_value_used TSRMLS_DC)
 {
 	int lineno;
-	char *filename;
+	const char *filename;
 	if (DTRACE_EXECUTE_ENTRY_ENABLED() || DTRACE_EXECUTE_RETURN_ENABLED()) {
 		filename = dtrace_get_executed_filename(TSRMLS_C);
 		lineno = zend_get_executed_lineno(TSRMLS_C);
 	}
 
 	if (DTRACE_EXECUTE_ENTRY_ENABLED()) {
-		DTRACE_EXECUTE_ENTRY(filename, lineno);
+		DTRACE_EXECUTE_ENTRY((char *)filename, lineno);
 	}
 
 	execute_internal(execute_data_ptr, return_value_used TSRMLS_CC);
 
 	if (DTRACE_EXECUTE_RETURN_ENABLED()) {
-		DTRACE_EXECUTE_RETURN(filename, lineno);
+		DTRACE_EXECUTE_RETURN((char *)filename, lineno);
 	}
 }
 
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index f457b2846..14ae75e38 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -85,12 +85,12 @@ void zend_throw_exception_internal(zval *exception TSRMLS_DC) /* {{{ */
 {
 #ifdef HAVE_DTRACE
 	if (DTRACE_EXCEPTION_THROWN_ENABLED()) {
-		char *classname;
-		int name_len;
+		const char *classname;
+		zend_uint name_len;
 
 		if (exception != NULL) {
 			zend_get_object_classname(exception, &classname, &name_len TSRMLS_CC);
-			DTRACE_EXCEPTION_THROWN(classname);
+			DTRACE_EXCEPTION_THROWN((char *)classname);
 		} else {
 			DTRACE_EXCEPTION_THROWN(NULL);
 		}
@@ -817,6 +817,10 @@ ZEND_API void zend_exception_error(zval *exception, int severity TSRMLS_DC) /* {
 			if (instanceof_function(ce_exception, default_exception_ce TSRMLS_CC)) {
 				file = zend_read_property(default_exception_ce, EG(exception), "file", sizeof("file")-1, 1 TSRMLS_CC);
 				line = zend_read_property(default_exception_ce, EG(exception), "line", sizeof("line")-1, 1 TSRMLS_CC);
+
+				convert_to_string(file);
+				file = (Z_STRLEN_P(file) > 0) ? file : NULL;
+				line = (Z_TYPE_P(line) == IS_LONG) ? line : NULL;
 			} else {
 				file = NULL;
 				line = NULL;
@@ -828,7 +832,11 @@ ZEND_API void zend_exception_error(zval *exception, int severity TSRMLS_DC) /* {
 		file = zend_read_property(default_exception_ce, exception, "file", sizeof("file")-1, 1 TSRMLS_CC);
 		line = zend_read_property(default_exception_ce, exception, "line", sizeof("line")-1, 1 TSRMLS_CC);
 
-		zend_error_va(severity, Z_STRVAL_P(file), Z_LVAL_P(line), "Uncaught %s\n  thrown", Z_STRVAL_P(str));
+		convert_to_string(str);
+		convert_to_string(file);
+		convert_to_long(line);
+
+		zend_error_va(severity, (Z_STRLEN_P(file) > 0) ? Z_STRVAL_P(file) : NULL, Z_LVAL_P(line), "Uncaught %s\n  thrown", Z_STRVAL_P(str));
 	} else {
 		zend_error(severity, "Uncaught exception '%s'", ce_exception->name);
 	}
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 09e703ca5..6fa7e9baf 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -254,15 +254,13 @@ void shutdown_executor(TSRMLS_D) /* {{{ */
 		if (EG(user_error_handler)) {
 			zeh = EG(user_error_handler);
 			EG(user_error_handler) = NULL;
-			zval_dtor(zeh);
-			FREE_ZVAL(zeh);
+			zval_ptr_dtor(&zeh);
 		}
 
 		if (EG(user_exception_handler)) {
 			zeh = EG(user_exception_handler);
 			EG(user_exception_handler) = NULL;
-			zval_dtor(zeh);
-			FREE_ZVAL(zeh);
+			zval_ptr_dtor(&zeh);
 		}
 
 		zend_stack_destroy(&EG(user_error_handlers_error_reporting));
@@ -1074,7 +1072,7 @@ ZEND_API int zend_lookup_class_ex(const char *name, int name_length, const zend_
 	}
 
 	/* The compiler is not-reentrant. Make sure we __autoload() only during run-time
-	 * (doesn't impact fuctionality of __autoload()
+	 * (doesn't impact functionality of __autoload()
 	*/
 	if (!use_autoload || zend_is_compiling(TSRMLS_C)) {
 		if (!key) {
diff --git a/Zend/zend_gc.h b/Zend/zend_gc.h
index a44303268..3483e9dbf 100644
--- a/Zend/zend_gc.h
+++ b/Zend/zend_gc.h
@@ -106,7 +106,7 @@ typedef struct _zend_gc_globals {
 	gc_root_buffer   *first_unused;		/* pointer to first unused buffer   */
 	gc_root_buffer   *last_unused;		/* pointer to last unused buffer    */
 
-	zval_gc_info     *zval_to_free;		/* temporaryt list of zvals to free */
+	zval_gc_info     *zval_to_free;		/* temporary list of zvals to free */
 	zval_gc_info     *free_list;
 	zval_gc_info     *next_to_free;
 
@@ -199,7 +199,7 @@ static zend_always_inline void gc_remove_from_buffer(gc_root_buffer *root TSRMLS
 		GC_ZVAL_INIT(z);								\
 	} while (0)
 
-/* The following macroses override macroses from zend_alloc.h */
+/* The following macros override macros from zend_alloc.h */
 #undef  ALLOC_ZVAL
 #define ALLOC_ZVAL(z) 									\
 	do {												\
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index 58392c199..646e9c9a6 100644
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -306,7 +306,7 @@ struct _zend_php_scanner_globals {
 	unsigned char *script_filtered;
 	size_t script_filtered_size;
 
-	/* input/ouput filters */
+	/* input/output filters */
 	zend_encoding_filter input_filter;
 	zend_encoding_filter output_filter;
 	const zend_encoding *script_encoding;
diff --git a/Zend/zend_ini_parser.c b/Zend/zend_ini_parser.c
index a3862d30f..70bc55ec0 100644
--- a/Zend/zend_ini_parser.c
+++ b/Zend/zend_ini_parser.c
@@ -1,24 +1,21 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
+/* A Bison parser, made by GNU Bison 2.7.  */
 
-/* Skeleton implementation for Bison's Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
+/* Bison implementation for Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -29,7 +26,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -47,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.3"
+#define YYBISON_VERSION "2.7"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -55,59 +52,21 @@
 /* Pure parsers.  */
 #define YYPURE 1
 
-/* Using locations.  */
-#define YYLSP_NEEDED 0
-
-/* Substitute the variable and function names.  */
-#define yyparse ini_parse
-#define yylex   ini_lex
-#define yyerror ini_error
-#define yylval  ini_lval
-#define yychar  ini_char
-#define yydebug ini_debug
-#define yynerrs ini_nerrs
-
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     TC_SECTION = 258,
-     TC_RAW = 259,
-     TC_CONSTANT = 260,
-     TC_NUMBER = 261,
-     TC_STRING = 262,
-     TC_WHITESPACE = 263,
-     TC_LABEL = 264,
-     TC_OFFSET = 265,
-     TC_DOLLAR_CURLY = 266,
-     TC_VARNAME = 267,
-     TC_QUOTED_STRING = 268,
-     BOOL_TRUE = 269,
-     BOOL_FALSE = 270,
-     END_OF_LINE = 271
-   };
-#endif
-/* Tokens.  */
-#define TC_SECTION 258
-#define TC_RAW 259
-#define TC_CONSTANT 260
-#define TC_NUMBER 261
-#define TC_STRING 262
-#define TC_WHITESPACE 263
-#define TC_LABEL 264
-#define TC_OFFSET 265
-#define TC_DOLLAR_CURLY 266
-#define TC_VARNAME 267
-#define TC_QUOTED_STRING 268
-#define BOOL_TRUE 269
-#define BOOL_FALSE 270
-#define END_OF_LINE 271
+/* Push parsers.  */
+#define YYPUSH 0
 
+/* Pull parsers.  */
+#define YYPULL 1
 
 
+/* Substitute the variable and function names.  */
+#define yyparse         ini_parse
+#define yylex           ini_lex
+#define yyerror         ini_error
+#define yylval          ini_lval
+#define yychar          ini_char
+#define yydebug         ini_debug
+#define yynerrs         ini_nerrs
 
 /* Copy the first part of user declarations.  */
 
@@ -359,10 +318,14 @@ ZEND_API int zend_parse_ini_string(char *str, zend_bool unbuffered_errors, int s
 
 
 
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
+
+# ifndef YY_NULL
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULL nullptr
+#  else
+#   define YY_NULL 0
+#  endif
+# endif
 
 /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE
@@ -372,24 +335,84 @@ ZEND_API int zend_parse_ini_string(char *str, zend_bool unbuffered_errors, int s
 # define YYERROR_VERBOSE 0
 #endif
 
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
+/* In a future release of Bison, this section will be replaced
+   by #include "zend_ini_parser.h".  */
+#ifndef YY_INI_ZEND_ZEND_INI_PARSER_H_INCLUDED
+# define YY_INI_ZEND_ZEND_INI_PARSER_H_INCLUDED
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
 #endif
+#if YYDEBUG
+extern int ini_debug;
+#endif
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     TC_SECTION = 258,
+     TC_RAW = 259,
+     TC_CONSTANT = 260,
+     TC_NUMBER = 261,
+     TC_STRING = 262,
+     TC_WHITESPACE = 263,
+     TC_LABEL = 264,
+     TC_OFFSET = 265,
+     TC_DOLLAR_CURLY = 266,
+     TC_VARNAME = 267,
+     TC_QUOTED_STRING = 268,
+     BOOL_TRUE = 269,
+     BOOL_FALSE = 270,
+     END_OF_LINE = 271
+   };
+#endif
+/* Tokens.  */
+#define TC_SECTION 258
+#define TC_RAW 259
+#define TC_CONSTANT 260
+#define TC_NUMBER 261
+#define TC_STRING 262
+#define TC_WHITESPACE 263
+#define TC_LABEL 264
+#define TC_OFFSET 265
+#define TC_DOLLAR_CURLY 266
+#define TC_VARNAME 267
+#define TC_QUOTED_STRING 268
+#define BOOL_TRUE 269
+#define BOOL_FALSE 270
+#define END_OF_LINE 271
+
+
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int ini_parse (void *YYPARSE_PARAM);
+#else
+int ini_parse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int ini_parse (void);
+#else
+int ini_parse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
 
-/* Copy the second part of user declarations.  */
+#endif /* !YY_INI_ZEND_ZEND_INI_PARSER_H_INCLUDED  */
 
+/* Copy the second part of user declarations.  */
 
-/* Line 216 of yacc.c.  */
 
 
 #ifdef short
@@ -443,36 +466,36 @@ typedef short int yytype_int16;
 # if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
 #  endif
 # endif
 # ifndef YY_
-#  define YY_(msgid) msgid
+#  define YY_(Msgid) Msgid
 # endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
+# define YYUSE(E) ((void) (E))
 #else
-# define YYUSE(e) /* empty */
+# define YYUSE(E) /* empty */
 #endif
 
 /* Identity function, used to suppress warnings about constant conditions.  */
 #ifndef lint
-# define YYID(n) (n)
+# define YYID(N) (N)
 #else
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static int
-YYID (int i)
+YYID (int yyi)
 #else
 static int
-YYID (i)
-    int i;
+YYID (yyi)
+    int yyi;
 #endif
 {
-  return i;
+  return yyi;
 }
 #endif
 
@@ -493,11 +516,12 @@ YYID (i)
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef _STDLIB_H
-#      define _STDLIB_H 1
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
 #     endif
 #    endif
 #   endif
@@ -520,24 +544,24 @@ YYID (i)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined _STDLIB_H \
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \
 	     && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef _STDLIB_H
-#    define _STDLIB_H 1
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
@@ -553,9 +577,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss;
-  YYSTYPE yyvs;
-  };
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -566,35 +590,19 @@ union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  YYSIZE_T yyi;				\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (YYID (0))
-#  endif
-# endif
+# define YYCOPY_NEEDED 1
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack)					\
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
     do									\
       {									\
 	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack, Stack, yysize);				\
-	Stack = &yyptr->Stack;						\
+	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
+	Stack = &yyptr->Stack_alloc;					\
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
@@ -602,6 +610,26 @@ union yyalloc
 
 #endif
 
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (YYID (0))
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
@@ -697,7 +725,7 @@ static const yytype_uint16 yyrline[] =
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || YYERROR_VERBOSE || 0
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
@@ -705,13 +733,13 @@ static const char *const yytname[] =
   "$end", "error", "$undefined", "TC_SECTION", "TC_RAW", "TC_CONSTANT",
   "TC_NUMBER", "TC_STRING", "TC_WHITESPACE", "TC_LABEL", "TC_OFFSET",
   "TC_DOLLAR_CURLY", "TC_VARNAME", "TC_QUOTED_STRING", "BOOL_TRUE",
-  "BOOL_FALSE", "END_OF_LINE", "'='", "':'", "','", "'.'", "'\"'", "'''",
+  "BOOL_FALSE", "END_OF_LINE", "'='", "':'", "','", "'.'", "'\"'", "'\\''",
   "'^'", "'+'", "'-'", "'/'", "'*'", "'%'", "'$'", "'~'", "'<'", "'>'",
   "'?'", "'@'", "'{'", "'}'", "'|'", "'&'", "'!'", "']'", "'('", "')'",
   "$accept", "statement_list", "statement", "section_string_or_value",
   "string_or_value", "option_offset", "encapsed_list",
   "var_string_list_section", "var_string_list", "expr", "cfg_var_ref",
-  "constant_literal", "constant_string", 0
+  "constant_literal", "constant_string", YY_NULL
 };
 #endif
 
@@ -748,8 +776,8 @@ static const yytype_uint8 yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1
 };
 
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
+   Performed when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
@@ -792,8 +820,7 @@ static const yytype_int8 yypgoto[] =
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
+   number is the opposite.  If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =
 {
@@ -810,6 +837,12 @@ static const yytype_uint8 yytable[] =
        0,     0,     4,     5,     0,    47,     0,    68,     0,     6
 };
 
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-36)))
+
+#define yytable_value_is_error(Yytable_value) \
+  YYID (0)
+
 static const yytype_int8 yycheck[] =
 {
        3,    25,    37,    38,     4,     5,     6,     7,     8,    33,
@@ -850,78 +883,50 @@ static const yytype_uint8 yystos[] =
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
+   Once GCC version 2 has supplanted version 1, this can go.  However,
+   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
+   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
+   discussed.  */
 
 #define YYFAIL		goto yyerrlab
+#if defined YYFAIL
+  /* This is here to suppress warnings from the GCC cpp's
+     -Wunused-macros.  Normally we don't worry about that warning, but
+     some users do, and we want to make it easy for users to remove
+     YYFAIL uses, which will produce warnings from Bison 2.5.  */
+#endif
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)					\
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    {								\
-      yychar = (Token);						\
-      yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
-      YYPOPSTACK (1);						\
-      goto yybackup;						\
-    }								\
-  else								\
-    {								\
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
       yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
 while (YYID (0))
 
-
+/* Error token number */
 #define YYTERROR	1
 #define YYERRCODE	256
 
 
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
-   If N is 0, then set CURRENT to the empty location which ends
-   the previous symbol: RHS[0] (always defined).  */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)				\
-    do									\
-      if (YYID (N))                                                    \
-	{								\
-	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
-	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
-	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
-	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
-	}								\
-      else								\
-	{								\
-	  (Current).first_line   = (Current).last_line   =		\
-	    YYRHSLOC (Rhs, 0).last_line;				\
-	  (Current).first_column = (Current).last_column =		\
-	    YYRHSLOC (Rhs, 0).last_column;				\
-	}								\
-    while (YYID (0))
-#endif
-
-
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
-
+/* This macro is provided for backward compatibility. */
 #ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)			\
-     fprintf (File, "%d.%d-%d.%d",			\
-	      (Loc).first_line, (Loc).first_column,	\
-	      (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
 #endif
 
 
 /* YYLEX -- calling `yylex' with the right arguments.  */
-
 #ifdef YYLEX_PARAM
 # define YYLEX yylex (&yylval, YYLEX_PARAM)
 #else
@@ -971,6 +976,8 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
     YYSTYPE const * const yyvaluep;
 #endif
 {
+  FILE *yyo = yyoutput;
+  YYUSE (yyo);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
@@ -982,7 +989,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
   switch (yytype)
     {
       default:
-	break;
+        break;
     }
 }
 
@@ -1020,17 +1027,20 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
 #else
 static void
-yy_stack_print (bottom, top)
-    yytype_int16 *bottom;
-    yytype_int16 *top;
+yy_stack_print (yybottom, yytop)
+    yytype_int16 *yybottom;
+    yytype_int16 *yytop;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (; bottom <= top; ++bottom)
-    YYFPRINTF (stderr, " %d", *bottom);
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
   YYFPRINTF (stderr, "\n");
 }
 
@@ -1064,11 +1074,11 @@ yy_reduce_print (yyvsp, yyrule)
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
-      fprintf (stderr, "   $%d = ", yyi + 1);
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
 		       		       );
-      fprintf (stderr, "\n");
+      YYFPRINTF (stderr, "\n");
     }
 }
 
@@ -1105,7 +1115,6 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
-
 
 #if YYERROR_VERBOSE
 
@@ -1208,115 +1217,145 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
 
-/* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
-   including the terminating null byte.  If YYRESULT is null, do not
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
-{
-  int yyn = yypact[yystate];
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
 
-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
-    return 0;
-  else
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULL;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - Assume YYFAIL is not used.  It's too flawed to consider.  See
+       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
+       for details.  YYERROR is fine as it does not invoke this
+       function.
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
     {
-      int yytype = YYTRANSLATE (yychar);
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-      YYSIZE_T yysize = yysize0;
-      YYSIZE_T yysize1;
-      int yysize_overflow = 0;
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-      int yyx;
-
-# if 0
-      /* This is so xgettext sees the translatable formats that are
-	 constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
-      char *yyfmt;
-      char const *yyf;
-      static char const yyunexpected[] = "syntax error, unexpected %s";
-      static char const yyexpecting[] = ", expecting %s";
-      static char const yyor[] = " or %s";
-      char yyformat[sizeof yyunexpected
-		    + sizeof yyexpecting - 1
-		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-		       * (sizeof yyor - 1))];
-      char const *yyprefix = yyexpecting;
-
-      /* Start YYX at -YYN if negative to avoid negative indexes in
-	 YYCHECK.  */
-      int yyxbegin = yyn < 0 ? -yyn : 0;
-
-      /* Stay within bounds of both yycheck and yytname.  */
-      int yychecklim = YYLAST - yyn + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      int yycount = 1;
-
-      yyarg[0] = yytname[yytype];
-      yyfmt = yystpcpy (yyformat, yyunexpected);
-
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	  {
-	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-	      {
-		yycount = 1;
-		yysize = yysize0;
-		yyformat[sizeof yyunexpected - 1] = '\0';
-		break;
-	      }
-	    yyarg[yycount++] = yytname[yyx];
-	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-	    yysize_overflow |= (yysize1 < yysize);
-	    yysize = yysize1;
-	    yyfmt = yystpcpy (yyfmt, yyprefix);
-	    yyprefix = yyor;
-	  }
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
+              }
+        }
+    }
 
-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
-      yysize_overflow |= (yysize1 < yysize);
-      yysize = yysize1;
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
 
-      if (yysize_overflow)
-	return YYSIZE_MAXIMUM;
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
 
-      if (yyresult)
-	{
-	  /* Avoid sprintf, as that infringes on the user's name space.
-	     Don't have undefined behavior even if the translation
-	     produced a string with the wrong number of "%s"s.  */
-	  char *yyp = yyresult;
-	  int yyi = 0;
-	  while ((*yyp = *yyf) != '\0')
-	    {
-	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		{
-		  yyp += yytnamerr (yyp, yyarg[yyi++]);
-		  yyf += 2;
-		}
-	      else
-		{
-		  yyp++;
-		  yyf++;
-		}
-	    }
-	}
-      return yysize;
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
     }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
 }
 #endif /* YYERROR_VERBOSE */
-
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
@@ -1345,28 +1384,9 @@ yydestruct (yymsg, yytype, yyvaluep)
     {
 
       default:
-	break;
+        break;
     }
 }
-
-
-/* Prevent warnings from -Wmissing-prototypes.  */
-
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-
 
 
 
@@ -1397,77 +1417,92 @@ yyparse ()
 #endif
 #endif
 {
-  /* The look-ahead symbol.  */
+/* The lookahead symbol.  */
 int yychar;
 
-/* The semantic value of the look-ahead symbol.  */
-YYSTYPE yylval;
-
-/* Number of syntax errors so far.  */
-int yynerrs;
 
-  int yystate;
-  int yyn;
-  int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Look-ahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
+#else
+/* Default value used for initialization, for pacifying older GCCs
+   or non-GCC compilers.  */
+static YYSTYPE yyval_default;
+# define YY_INITIAL_VALUE(Value) = Value
+#endif
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
 #endif
 
-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
 
-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
+    /* Number of syntax errors so far.  */
+    int yynerrs;
 
-  /* The state stack.  */
-  yytype_int16 yyssa[YYINITDEPTH];
-  yytype_int16 *yyss = yyssa;
-  yytype_int16 *yyssp;
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
 
-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  YYSTYPE *yyvsp;
+    /* The stacks and their tools:
+       `yyss': related to states.
+       `yyvs': related to semantic values.
 
+       Refer to the stacks through separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
 
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
 
-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
 
-  YYSIZE_T yystacksize = YYINITDEPTH;
+    YYSIZE_T yystacksize;
 
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken = 0;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
 
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-
-  yyssp = yyss;
-  yyvsp = yyvs;
-
+  yychar = YYEMPTY; /* Cause a token to be read.  */
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1494,7 +1529,6 @@ int yynerrs;
 	YYSTYPE *yyvs1 = yyvs;
 	yytype_int16 *yyss1 = yyss;
 
-
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
@@ -1502,7 +1536,6 @@ int yynerrs;
 	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
-
 		    &yystacksize);
 
 	yyss = yyss1;
@@ -1525,9 +1558,8 @@ int yynerrs;
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
 	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss);
-	YYSTACK_RELOCATE (yyvs);
-
+	YYSTACK_RELOCATE (yyss_alloc, yyss);
+	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
@@ -1538,7 +1570,6 @@ int yynerrs;
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
-
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
@@ -1548,6 +1579,9 @@ int yynerrs;
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
   goto yybackup;
 
 /*-----------.
@@ -1556,16 +1590,16 @@ int yynerrs;
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a
-     look-ahead token if we need one and don't already have one.  */
+     lookahead token if we need one and don't already have one.  */
 
-  /* First try to decide what to do without reference to look-ahead token.  */
+  /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
+  if (yypact_value_is_default (yyn))
     goto yydefault;
 
-  /* Not known => get a look-ahead token if don't already have one.  */
+  /* Not known => get a lookahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -1591,29 +1625,27 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
-	goto yyerrlab;
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
-  /* Shift the look-ahead token.  */
+  /* Shift the lookahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the shifted token unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
 
   yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
   goto yynewstate;
 
@@ -1891,10 +1923,20 @@ yyreduce:
     break;
 
 
-/* Line 1267 of yacc.c.  */
 
       default: break;
     }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
@@ -1903,7 +1945,6 @@ yyreduce:
 
   *++yyvsp = yyval;
 
-
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
@@ -1923,6 +1964,10 @@ yyreduce:
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
@@ -1930,37 +1975,36 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
       {
-	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-	  {
-	    YYSIZE_T yyalloc = 2 * yysize;
-	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
-	    if (yymsg != yymsgbuf)
-	      YYSTACK_FREE (yymsg);
-	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-	    if (yymsg)
-	      yymsg_alloc = yyalloc;
-	    else
-	      {
-		yymsg = yymsgbuf;
-		yymsg_alloc = sizeof yymsgbuf;
-	      }
-	  }
-
-	if (0 < yysize && yysize <= yymsg_alloc)
-	  {
-	    (void) yysyntax_error (yymsg, yystate, yychar);
-	    yyerror (yymsg);
-	  }
-	else
-	  {
-	    yyerror (YY_("syntax error"));
-	    if (yysize != 0)
-	      goto yyexhaustedlab;
-	  }
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
       }
+# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -1968,7 +2012,7 @@ yyerrlab:
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse look-ahead token after an
+      /* If just tried and failed to reuse lookahead token after an
 	 error, discard it.  */
 
       if (yychar <= YYEOF)
@@ -1985,7 +2029,7 @@ yyerrlab:
 	}
     }
 
-  /* Else will try to reuse look-ahead token after shifting the error
+  /* Else will try to reuse lookahead token after shifting the error
      token.  */
   goto yyerrlab1;
 
@@ -2019,7 +2063,7 @@ yyerrlab1:
   for (;;)
     {
       yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
+      if (!yypact_value_is_default (yyn))
 	{
 	  yyn += YYTERROR;
 	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
@@ -2042,10 +2086,9 @@ yyerrlab1:
       YY_STACK_PRINT (yyss, yyssp);
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
 
   /* Shift the error token.  */
@@ -2069,7 +2112,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#ifndef yyoverflow
+#if !defined yyoverflow || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -2080,9 +2123,14 @@ yyexhaustedlab:
 #endif
 
 yyreturn:
-  if (yychar != YYEOF && yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
-		 yytoken, &yylval);
+  if (yychar != YYEMPTY)
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval);
+    }
   /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
@@ -2106,4 +2154,3 @@ yyreturn:
 }
 
 
-
diff --git a/Zend/zend_ini_parser.h b/Zend/zend_ini_parser.h
index d883f9d40..42bb013c0 100644
--- a/Zend/zend_ini_parser.h
+++ b/Zend/zend_ini_parser.h
@@ -1,24 +1,21 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
+/* A Bison parser, made by GNU Bison 2.7.  */
 
-/* Skeleton interface for Bison's Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
+/* Bison interface for Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -29,10 +26,20 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
+#ifndef YY_INI_ZEND_ZEND_INI_PARSER_H_INCLUDED
+# define YY_INI_ZEND_ZEND_INI_PARSER_H_INCLUDED
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int ini_debug;
+#endif
+
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
@@ -73,13 +80,26 @@
 
 
 
-
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int ini_parse (void *YYPARSE_PARAM);
+#else
+int ini_parse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int ini_parse (void);
+#else
+int ini_parse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
 
+#endif /* !YY_INI_ZEND_ZEND_INI_PARSER_H_INCLUDED  */
diff --git a/Zend/zend_ini_parser.output b/Zend/zend_ini_parser.output
index 9f7bcda21..8c597b4da 100644
--- a/Zend/zend_ini_parser.output
+++ b/Zend/zend_ini_parser.output
@@ -1,9 +1,9 @@
-Terminals which are not used
+Terminals unused in grammar
 
    ':'
    ','
    '.'
-   '''
+   '\''
    '^'
    '+'
    '-'
@@ -90,7 +90,7 @@ $end (0) 0
 '$' (36)
 '%' (37)
 '&' (38) 33
-''' (39)
+'\'' (39)
 '(' (40) 36
 ')' (41) 36
 '*' (42)
@@ -158,7 +158,7 @@ constant_string (55)
     on left: 43 44 45 46 47, on right: 26 29
 
 
-state 0
+State 0
 
     0 $accept: . statement_list $end
 
@@ -167,7 +167,7 @@ state 0
     statement_list  go to state 1
 
 
-state 1
+State 1
 
     0 $accept: statement_list . $end
     1 statement_list: statement_list . statement
@@ -181,14 +181,14 @@ state 1
     statement  go to state 7
 
 
-state 2
+State 2
 
     0 $accept: statement_list $end .
 
     $default  accept
 
 
-state 3
+State 3
 
     3 statement: TC_SECTION . section_string_or_value ']'
 
@@ -208,7 +208,7 @@ state 3
     constant_literal         go to state 18
 
 
-state 4
+State 4
 
     4 statement: TC_LABEL . '=' string_or_value
     6          | TC_LABEL .
@@ -218,7 +218,7 @@ state 4
     $default  reduce using rule 6 (statement)
 
 
-state 5
+State 5
 
     5 statement: TC_OFFSET . option_offset ']' '=' string_or_value
 
@@ -238,63 +238,63 @@ state 5
     constant_string  go to state 29
 
 
-state 6
+State 6
 
     7 statement: END_OF_LINE .
 
     $default  reduce using rule 7 (statement)
 
 
-state 7
+State 7
 
     1 statement_list: statement_list statement .
 
     $default  reduce using rule 1 (statement_list)
 
 
-state 8
+State 8
 
    39 constant_literal: TC_RAW .
 
     $default  reduce using rule 39 (constant_literal)
 
 
-state 9
+State 9
 
    38 constant_literal: TC_CONSTANT .
 
     $default  reduce using rule 38 (constant_literal)
 
 
-state 10
+State 10
 
    40 constant_literal: TC_NUMBER .
 
     $default  reduce using rule 40 (constant_literal)
 
 
-state 11
+State 11
 
    41 constant_literal: TC_STRING .
 
     $default  reduce using rule 41 (constant_literal)
 
 
-state 12
+State 12
 
    42 constant_literal: TC_WHITESPACE .
 
     $default  reduce using rule 42 (constant_literal)
 
 
-state 13
+State 13
 
    37 cfg_var_ref: TC_DOLLAR_CURLY . TC_VARNAME '}'
 
     TC_VARNAME  shift, and go to state 30
 
 
-state 14
+State 14
 
    21 var_string_list_section: '"' . encapsed_list '"'
 
@@ -303,14 +303,14 @@ state 14
     encapsed_list  go to state 31
 
 
-state 15
+State 15
 
     3 statement: TC_SECTION section_string_or_value . ']'
 
     ']'  shift, and go to state 32
 
 
-state 16
+State 16
 
     8 section_string_or_value: var_string_list_section .
    22 var_string_list_section: var_string_list_section . cfg_var_ref
@@ -331,21 +331,21 @@ state 16
     constant_literal  go to state 35
 
 
-state 17
+State 17
 
    19 var_string_list_section: cfg_var_ref .
 
     $default  reduce using rule 19 (var_string_list_section)
 
 
-state 18
+State 18
 
    20 var_string_list_section: constant_literal .
 
     $default  reduce using rule 20 (var_string_list_section)
 
 
-state 19
+State 19
 
     4 statement: TC_LABEL '=' . string_or_value
 
@@ -370,42 +370,42 @@ state 19
     constant_string  go to state 29
 
 
-state 20
+State 20
 
    44 constant_string: TC_RAW .
 
     $default  reduce using rule 44 (constant_string)
 
 
-state 21
+State 21
 
    43 constant_string: TC_CONSTANT .
 
     $default  reduce using rule 43 (constant_string)
 
 
-state 22
+State 22
 
    45 constant_string: TC_NUMBER .
 
     $default  reduce using rule 45 (constant_string)
 
 
-state 23
+State 23
 
    46 constant_string: TC_STRING .
 
     $default  reduce using rule 46 (constant_string)
 
 
-state 24
+State 24
 
    47 constant_string: TC_WHITESPACE .
 
     $default  reduce using rule 47 (constant_string)
 
 
-state 25
+State 25
 
    27 var_string_list: '"' . encapsed_list '"'
 
@@ -414,14 +414,14 @@ state 25
     encapsed_list  go to state 45
 
 
-state 26
+State 26
 
     5 statement: TC_OFFSET option_offset . ']' '=' string_or_value
 
     ']'  shift, and go to state 46
 
 
-state 27
+State 27
 
    14 option_offset: var_string_list .
    28 var_string_list: var_string_list . cfg_var_ref
@@ -442,28 +442,28 @@ state 27
     constant_string  go to state 49
 
 
-state 28
+State 28
 
    25 var_string_list: cfg_var_ref .
 
     $default  reduce using rule 25 (var_string_list)
 
 
-state 29
+State 29
 
    26 var_string_list: constant_string .
 
     $default  reduce using rule 26 (var_string_list)
 
 
-state 30
+State 30
 
    37 cfg_var_ref: TC_DOLLAR_CURLY TC_VARNAME . '}'
 
     '}'  shift, and go to state 50
 
 
-state 31
+State 31
 
    16 encapsed_list: encapsed_list . cfg_var_ref
    17              | encapsed_list . TC_QUOTED_STRING
@@ -476,14 +476,14 @@ state 31
     cfg_var_ref  go to state 53
 
 
-state 32
+State 32
 
     3 statement: TC_SECTION section_string_or_value ']' .
 
     $default  reduce using rule 3 (statement)
 
 
-state 33
+State 33
 
    24 var_string_list_section: var_string_list_section '"' . encapsed_list '"'
 
@@ -492,42 +492,42 @@ state 33
     encapsed_list  go to state 54
 
 
-state 34
+State 34
 
    22 var_string_list_section: var_string_list_section cfg_var_ref .
 
     $default  reduce using rule 22 (var_string_list_section)
 
 
-state 35
+State 35
 
    23 var_string_list_section: var_string_list_section constant_literal .
 
     $default  reduce using rule 23 (var_string_list_section)
 
 
-state 36
+State 36
 
    11 string_or_value: BOOL_TRUE .
 
     $default  reduce using rule 11 (string_or_value)
 
 
-state 37
+State 37
 
    12 string_or_value: BOOL_FALSE .
 
     $default  reduce using rule 12 (string_or_value)
 
 
-state 38
+State 38
 
    13 string_or_value: END_OF_LINE .
 
     $default  reduce using rule 13 (string_or_value)
 
 
-state 39
+State 39
 
    34 expr: '~' . expr
 
@@ -548,7 +548,7 @@ state 39
     constant_string  go to state 29
 
 
-state 40
+State 40
 
    35 expr: '!' . expr
 
@@ -569,7 +569,7 @@ state 40
     constant_string  go to state 29
 
 
-state 41
+State 41
 
    36 expr: '(' . expr ')'
 
@@ -590,14 +590,14 @@ state 41
     constant_string  go to state 29
 
 
-state 42
+State 42
 
     4 statement: TC_LABEL '=' string_or_value .
 
     $default  reduce using rule 4 (statement)
 
 
-state 43
+State 43
 
    28 var_string_list: var_string_list . cfg_var_ref
    29                | var_string_list . constant_string
@@ -618,7 +618,7 @@ state 43
     constant_string  go to state 49
 
 
-state 44
+State 44
 
    10 string_or_value: expr .
    32 expr: expr . '|' expr
@@ -630,7 +630,7 @@ state 44
     $default  reduce using rule 10 (string_or_value)
 
 
-state 45
+State 45
 
    16 encapsed_list: encapsed_list . cfg_var_ref
    17              | encapsed_list . TC_QUOTED_STRING
@@ -643,14 +643,14 @@ state 45
     cfg_var_ref  go to state 53
 
 
-state 46
+State 46
 
     5 statement: TC_OFFSET option_offset ']' . '=' string_or_value
 
     '='  shift, and go to state 61
 
 
-state 47
+State 47
 
    30 var_string_list: var_string_list '"' . encapsed_list '"'
 
@@ -659,49 +659,49 @@ state 47
     encapsed_list  go to state 62
 
 
-state 48
+State 48
 
    28 var_string_list: var_string_list cfg_var_ref .
 
     $default  reduce using rule 28 (var_string_list)
 
 
-state 49
+State 49
 
    29 var_string_list: var_string_list constant_string .
 
     $default  reduce using rule 29 (var_string_list)
 
 
-state 50
+State 50
 
    37 cfg_var_ref: TC_DOLLAR_CURLY TC_VARNAME '}' .
 
     $default  reduce using rule 37 (cfg_var_ref)
 
 
-state 51
+State 51
 
    17 encapsed_list: encapsed_list TC_QUOTED_STRING .
 
     $default  reduce using rule 17 (encapsed_list)
 
 
-state 52
+State 52
 
    21 var_string_list_section: '"' encapsed_list '"' .
 
     $default  reduce using rule 21 (var_string_list_section)
 
 
-state 53
+State 53
 
    16 encapsed_list: encapsed_list cfg_var_ref .
 
     $default  reduce using rule 16 (encapsed_list)
 
 
-state 54
+State 54
 
    16 encapsed_list: encapsed_list . cfg_var_ref
    17              | encapsed_list . TC_QUOTED_STRING
@@ -714,7 +714,7 @@ state 54
     cfg_var_ref  go to state 53
 
 
-state 55
+State 55
 
    32 expr: expr . '|' expr
    33     | expr . '&' expr
@@ -723,7 +723,7 @@ state 55
     $default  reduce using rule 34 (expr)
 
 
-state 56
+State 56
 
    32 expr: expr . '|' expr
    33     | expr . '&' expr
@@ -732,7 +732,7 @@ state 56
     $default  reduce using rule 35 (expr)
 
 
-state 57
+State 57
 
    32 expr: expr . '|' expr
    33     | expr . '&' expr
@@ -743,7 +743,7 @@ state 57
     ')'  shift, and go to state 64
 
 
-state 58
+State 58
 
    32 expr: expr '|' . expr
 
@@ -764,7 +764,7 @@ state 58
     constant_string  go to state 29
 
 
-state 59
+State 59
 
    33 expr: expr '&' . expr
 
@@ -785,14 +785,14 @@ state 59
     constant_string  go to state 29
 
 
-state 60
+State 60
 
    27 var_string_list: '"' encapsed_list '"' .
 
     $default  reduce using rule 27 (var_string_list)
 
 
-state 61
+State 61
 
     5 statement: TC_OFFSET option_offset ']' '=' . string_or_value
 
@@ -817,7 +817,7 @@ state 61
     constant_string  go to state 29
 
 
-state 62
+State 62
 
    16 encapsed_list: encapsed_list . cfg_var_ref
    17              | encapsed_list . TC_QUOTED_STRING
@@ -830,21 +830,21 @@ state 62
     cfg_var_ref  go to state 53
 
 
-state 63
+State 63
 
    24 var_string_list_section: var_string_list_section '"' encapsed_list '"' .
 
     $default  reduce using rule 24 (var_string_list_section)
 
 
-state 64
+State 64
 
    36 expr: '(' expr ')' .
 
     $default  reduce using rule 36 (expr)
 
 
-state 65
+State 65
 
    32 expr: expr . '|' expr
    32     | expr '|' expr .
@@ -853,7 +853,7 @@ state 65
     $default  reduce using rule 32 (expr)
 
 
-state 66
+State 66
 
    32 expr: expr . '|' expr
    33     | expr . '&' expr
@@ -862,14 +862,14 @@ state 66
     $default  reduce using rule 33 (expr)
 
 
-state 67
+State 67
 
     5 statement: TC_OFFSET option_offset ']' '=' string_or_value .
 
     $default  reduce using rule 5 (statement)
 
 
-state 68
+State 68
 
    30 var_string_list: var_string_list '"' encapsed_list '"' .
 
diff --git a/Zend/zend_language_parser.c b/Zend/zend_language_parser.c
index 295da98ca..1c5c71cd0 100644
--- a/Zend/zend_language_parser.c
+++ b/Zend/zend_language_parser.c
@@ -1,24 +1,21 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
+/* A Bison parser, made by GNU Bison 2.7.  */
 
-/* Skeleton implementation for Bison's Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
+/* Bison implementation for Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -29,7 +26,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -47,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.3"
+#define YYBISON_VERSION "2.7"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -55,17 +52,107 @@
 /* Pure parsers.  */
 #define YYPURE 1
 
-/* Using locations.  */
-#define YYLSP_NEEDED 0
+/* Push parsers.  */
+#define YYPUSH 0
+
+/* Pull parsers.  */
+#define YYPULL 1
+
 
 /* Substitute the variable and function names.  */
-#define yyparse zendparse
-#define yylex   zendlex
-#define yyerror zenderror
-#define yylval  zendlval
-#define yychar  zendchar
-#define yydebug zenddebug
-#define yynerrs zendnerrs
+#define yyparse         zendparse
+#define yylex           zendlex
+#define yyerror         zenderror
+#define yylval          zendlval
+#define yychar          zendchar
+#define yydebug         zenddebug
+#define yynerrs         zendnerrs
+
+/* Copy the first part of user declarations.  */
+
+
+/*
+   +----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2013 Zend Technologies Ltd. (http://www.zend.com) |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+/*
+ * LALR shift/reduce conflicts and how they are resolved:
+ *
+ * - 2 shift/reduce conflicts due to the dangling elseif/else ambiguity. Solved by shift.
+ *
+ */
+
+
+#include "zend_compile.h"
+#include "zend.h"
+#include "zend_list.h"
+#include "zend_globals.h"
+#include "zend_API.h"
+#include "zend_constants.h"
+
+#define YYSIZE_T size_t
+#define yytnamerr zend_yytnamerr
+static YYSIZE_T zend_yytnamerr(char*, const char*);
+
+#define YYERROR_VERBOSE
+#define YYSTYPE znode
+
+
+
+
+# ifndef YY_NULL
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULL nullptr
+#  else
+#   define YY_NULL 0
+#  endif
+# endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* In a future release of Bison, this section will be replaced
+   by #include "zend_language_parser.h".  */
+#ifndef YY_ZEND_ZEND_ZEND_LANGUAGE_PARSER_H_INCLUDED
+# define YY_ZEND_ZEND_ZEND_LANGUAGE_PARSER_H_INCLUDED
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int zenddebug;
+#endif
+/* "%code requires" blocks.  */
+
+
+#ifdef ZTS
+# define YYPARSE_PARAM tsrm_ls
+# define YYLEX_PARAM tsrm_ls
+#endif
+
+
 
 
 /* Tokens.  */
@@ -336,92 +423,33 @@
 
 
 
-
-/* Copy the first part of user declarations.  */
-
-
-/*
-   +----------------------------------------------------------------------+
-   | Zend Engine                                                          |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2013 Zend Technologies Ltd. (http://www.zend.com) |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.00 of the Zend license,     |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.zend.com/license/2_00.txt.                                |
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@zend.com so we can mail you a copy immediately.              |
-   +----------------------------------------------------------------------+
-   | Authors: Andi Gutmans <andi@zend.com>                                |
-   |          Zeev Suraski <zeev@zend.com>                                |
-   +----------------------------------------------------------------------+
-*/
-
-/* $Id$ */
-
-/*
- * LALR shift/reduce conflicts and how they are resolved:
- *
- * - 2 shift/reduce conflicts due to the dangling elseif/else ambiguity. Solved by shift.
- *
- */
-
-
-#include "zend_compile.h"
-#include "zend.h"
-#include "zend_list.h"
-#include "zend_globals.h"
-#include "zend_API.h"
-#include "zend_constants.h"
-
-#define YYSIZE_T size_t
-#define yytnamerr zend_yytnamerr
-static YYSIZE_T zend_yytnamerr(char*, const char*);
-
-#define YYERROR_VERBOSE
-#define YYSTYPE znode
-#ifdef ZTS
-# define YYPARSE_PARAM tsrm_ls
-# define YYLEX_PARAM tsrm_ls
-#endif
-
-
-
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int zendparse (void *YYPARSE_PARAM);
+#else
+int zendparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int zendparse (void);
+#else
+int zendparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+#endif /* !YY_ZEND_ZEND_ZEND_LANGUAGE_PARSER_H_INCLUDED  */
 
 /* Copy the second part of user declarations.  */
 
 
-/* Line 216 of yacc.c.  */
-
 
 #ifdef short
 # undef short
@@ -474,36 +502,36 @@ typedef short int yytype_int16;
 # if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
 #  endif
 # endif
 # ifndef YY_
-#  define YY_(msgid) msgid
+#  define YY_(Msgid) Msgid
 # endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
+# define YYUSE(E) ((void) (E))
 #else
-# define YYUSE(e) /* empty */
+# define YYUSE(E) /* empty */
 #endif
 
 /* Identity function, used to suppress warnings about constant conditions.  */
 #ifndef lint
-# define YYID(n) (n)
+# define YYID(N) (N)
 #else
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static int
-YYID (int i)
+YYID (int yyi)
 #else
 static int
-YYID (i)
-    int i;
+YYID (yyi)
+    int yyi;
 #endif
 {
-  return i;
+  return yyi;
 }
 #endif
 
@@ -524,11 +552,12 @@ YYID (i)
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef _STDLIB_H
-#      define _STDLIB_H 1
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
 #     endif
 #    endif
 #   endif
@@ -551,24 +580,24 @@ YYID (i)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined _STDLIB_H \
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \
 	     && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef _STDLIB_H
-#    define _STDLIB_H 1
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
@@ -584,9 +613,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss;
-  YYSTYPE yyvs;
-  };
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -597,35 +626,19 @@ union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  YYSIZE_T yyi;				\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (YYID (0))
-#  endif
-# endif
+# define YYCOPY_NEEDED 1
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack)					\
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
     do									\
       {									\
 	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack, Stack, yysize);				\
-	Stack = &yyptr->Stack;						\
+	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
+	Stack = &yyptr->Stack_alloc;					\
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
@@ -633,6 +646,26 @@ union yyalloc
 
 #endif
 
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (YYID (0))
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */
@@ -933,62 +966,62 @@ static const yytype_int16 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   214,   214,   218,   218,   219,   223,   224,   228,   229,
-     230,   231,   232,   233,   233,   235,   235,   237,   238,   242,
-     243,   247,   248,   249,   250,   254,   255,   259,   259,   260,
-     265,   266,   267,   268,   273,   274,   278,   279,   279,   279,
-     280,   280,   280,   281,   281,   281,   282,   282,   282,   286,
-     288,   290,   283,   292,   292,   293,   294,   295,   296,   297,
-     298,   299,   300,   301,   302,   303,   304,   305,   307,   308,
-     306,   311,   312,   310,   314,   314,   315,   316,   317,   318,
-     319,   320,   316,   322,   323,   328,   329,   333,   334,   339,
-     339,   339,   344,   345,   349,   353,   357,   362,   363,   368,
-     368,   374,   373,   380,   379,   389,   390,   391,   392,   396,
-     397,   401,   404,   406,   409,   411,   415,   416,   420,   421,
-     426,   427,   431,   432,   437,   438,   443,   444,   449,   450,
-     455,   456,   457,   458,   463,   464,   464,   465,   465,   470,
-     471,   476,   477,   482,   484,   484,   488,   490,   490,   494,
-     496,   500,   502,   507,   508,   513,   514,   515,   516,   517,
-     518,   519,   520,   525,   526,   527,   528,   533,   534,   539,
-     540,   541,   542,   543,   544,   548,   549,   554,   555,   556,
-     561,   562,   563,   564,   570,   571,   576,   576,   577,   578,
-     579,   579,   584,   588,   589,   593,   594,   597,   599,   603,
-     604,   608,   609,   613,   617,   618,   622,   623,   627,   631,
-     632,   636,   637,   641,   642,   646,   647,   651,   652,   656,
-     657,   661,   662,   663,   664,   665,   666,   670,   671,   672,
-     673,   677,   678,   682,   683,   688,   689,   693,   693,   694,
-     698,   699,   703,   704,   708,   708,   709,   710,   714,   715,
-     715,   720,   720,   724,   724,   725,   726,   727,   727,   728,
-     729,   730,   731,   732,   733,   734,   735,   736,   737,   738,
-     739,   740,   741,   742,   743,   744,   744,   745,   745,   746,
-     746,   747,   747,   748,   749,   750,   751,   752,   753,   754,
-     755,   756,   757,   758,   759,   760,   761,   762,   763,   764,
-     765,   766,   767,   768,   769,   770,   771,   772,   773,   774,
-     775,   775,   776,   777,   776,   779,   779,   781,   782,   783,
-     784,   785,   786,   787,   788,   789,   790,   790,   791,   792,
-     793,   794,   795,   796,   796,   798,   798,   803,   806,   808,
-     812,   813,   814,   815,   819,   819,   822,   822,   825,   825,
-     828,   828,   831,   831,   834,   834,   837,   837,   840,   840,
-     846,   847,   848,   849,   853,   854,   855,   861,   862,   867,
-     868,   867,   870,   875,   876,   881,   885,   886,   887,   891,
-     892,   893,   898,   899,   904,   905,   906,   907,   908,   909,
-     910,   911,   912,   913,   914,   915,   920,   921,   922,   923,
-     924,   925,   926,   927,   928,   929,   933,   937,   938,   939,
-     940,   941,   942,   943,   944,   945,   950,   951,   954,   956,
-     960,   961,   962,   963,   967,   968,   973,   978,   983,   988,
-     989,   988,   991,   995,   996,  1001,  1001,  1005,  1006,  1010,
-    1010,  1016,  1017,  1018,  1022,  1023,  1027,  1028,  1033,  1037,
-    1038,  1038,  1043,  1044,  1045,  1050,  1051,  1052,  1056,  1057,
-    1058,  1063,  1064,  1068,  1069,  1074,  1075,  1075,  1079,  1080,
-    1081,  1085,  1086,  1090,  1091,  1095,  1096,  1101,  1102,  1102,
-    1103,  1108,  1109,  1113,  1114,  1115,  1116,  1117,  1118,  1119,
-    1120,  1124,  1125,  1126,  1127,  1133,  1134,  1134,  1135,  1136,
-    1137,  1138,  1143,  1144,  1145,  1150,  1151,  1152,  1153,  1154,
-    1155,  1156,  1160,  1161,  1161,  1165,  1166
+       0,   216,   216,   220,   220,   221,   225,   226,   230,   231,
+     232,   233,   234,   235,   235,   237,   237,   239,   240,   244,
+     245,   249,   250,   251,   252,   256,   257,   261,   261,   262,
+     267,   268,   269,   270,   275,   276,   280,   281,   281,   281,
+     282,   282,   282,   283,   283,   283,   284,   284,   284,   288,
+     290,   292,   285,   294,   294,   295,   296,   297,   298,   299,
+     300,   301,   302,   303,   304,   305,   306,   307,   309,   310,
+     308,   313,   314,   312,   316,   316,   317,   318,   319,   320,
+     321,   322,   318,   324,   325,   330,   331,   335,   336,   341,
+     341,   341,   346,   347,   351,   355,   359,   364,   365,   370,
+     370,   376,   375,   382,   381,   391,   392,   393,   394,   398,
+     399,   403,   406,   408,   411,   413,   417,   418,   422,   423,
+     428,   429,   433,   434,   439,   440,   445,   446,   451,   452,
+     457,   458,   459,   460,   465,   466,   466,   467,   467,   472,
+     473,   478,   479,   484,   486,   486,   490,   492,   492,   496,
+     498,   502,   504,   509,   510,   515,   516,   517,   518,   519,
+     520,   521,   522,   527,   528,   529,   530,   535,   536,   541,
+     542,   543,   544,   545,   546,   550,   551,   556,   557,   558,
+     563,   564,   565,   566,   572,   573,   578,   578,   579,   580,
+     581,   581,   586,   590,   591,   595,   596,   599,   601,   605,
+     606,   610,   611,   615,   619,   620,   624,   625,   629,   633,
+     634,   638,   639,   643,   644,   648,   649,   653,   654,   658,
+     659,   663,   664,   665,   666,   667,   668,   672,   673,   674,
+     675,   679,   680,   684,   685,   690,   691,   695,   695,   696,
+     700,   701,   705,   706,   710,   710,   711,   712,   716,   717,
+     717,   722,   722,   726,   726,   727,   728,   729,   729,   730,
+     731,   732,   733,   734,   735,   736,   737,   738,   739,   740,
+     741,   742,   743,   744,   745,   746,   746,   747,   747,   748,
+     748,   749,   749,   750,   751,   752,   753,   754,   755,   756,
+     757,   758,   759,   760,   761,   762,   763,   764,   765,   766,
+     767,   768,   769,   770,   771,   772,   773,   774,   775,   776,
+     777,   777,   778,   779,   778,   781,   781,   783,   784,   785,
+     786,   787,   788,   789,   790,   791,   792,   792,   793,   794,
+     795,   796,   797,   798,   798,   800,   800,   805,   808,   810,
+     814,   815,   816,   817,   821,   821,   824,   824,   827,   827,
+     830,   830,   833,   833,   836,   836,   839,   839,   842,   842,
+     848,   849,   850,   851,   855,   856,   857,   863,   864,   869,
+     870,   869,   872,   877,   878,   883,   887,   888,   889,   893,
+     894,   895,   900,   901,   906,   907,   908,   909,   910,   911,
+     912,   913,   914,   915,   916,   917,   922,   923,   924,   925,
+     926,   927,   928,   929,   930,   931,   935,   939,   940,   941,
+     942,   943,   944,   945,   946,   947,   952,   953,   956,   958,
+     962,   963,   964,   965,   969,   970,   975,   980,   985,   990,
+     991,   990,   993,   997,   998,  1003,  1003,  1007,  1008,  1012,
+    1012,  1018,  1019,  1020,  1024,  1025,  1029,  1030,  1035,  1039,
+    1040,  1040,  1045,  1046,  1047,  1052,  1053,  1054,  1058,  1059,
+    1060,  1065,  1066,  1070,  1071,  1076,  1077,  1077,  1081,  1082,
+    1083,  1087,  1088,  1092,  1093,  1097,  1098,  1103,  1104,  1104,
+    1105,  1110,  1111,  1115,  1116,  1117,  1118,  1119,  1120,  1121,
+    1122,  1126,  1127,  1128,  1129,  1135,  1136,  1136,  1137,  1138,
+    1139,  1140,  1145,  1146,  1147,  1152,  1153,  1154,  1155,  1156,
+    1157,  1158,  1162,  1163,  1163,  1167,  1168
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || YYERROR_VERBOSE || 0
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
@@ -1055,27 +1088,28 @@ static const char *const yytname[] =
   "\":: (T_PAAMAYIM_NEKUDOTAYIM)\"", "\"namespace (T_NAMESPACE)\"",
   "\"__NAMESPACE__ (T_NS_C)\"", "\"__DIR__ (T_DIR)\"",
   "\"\\\\ (T_NS_SEPARATOR)\"", "'('", "')'", "';'", "'{'", "'}'", "'$'",
-  "']'", "'`'", "'\"'", "$accept", "start", "top_statement_list", "@1",
-  "namespace_name", "top_statement", "@2", "@3", "use_declarations",
-  "use_declaration", "constant_declaration", "inner_statement_list", "@4",
-  "inner_statement", "statement", "unticked_statement", "@5", "@6", "@7",
-  "@8", "@9", "@10", "@11", "@12", "@13", "@14", "@15", "@16", "@17",
-  "@18", "@19", "@20", "@21", "@22", "@23", "@24", "@25", "@26",
-  "additional_catches", "non_empty_additional_catches", "additional_catch",
-  "@27", "@28", "unset_variables", "unset_variable",
+  "']'", "'`'", "'\"'", "$accept", "start", "top_statement_list", "$@1",
+  "namespace_name", "top_statement", "$@2", "$@3", "use_declarations",
+  "use_declaration", "constant_declaration", "inner_statement_list", "$@4",
+  "inner_statement", "statement", "unticked_statement", "$@5", "$@6",
+  "$@7", "$@8", "$@9", "$@10", "$@11", "$@12", "$@13", "$@14", "$@15",
+  "$@16", "$@17", "$@18", "$@19", "$@20", "$@21", "$@22", "$@23", "$@24",
+  "$@25", "$@26", "additional_catches", "non_empty_additional_catches",
+  "additional_catch", "@27", "$@28", "unset_variables", "unset_variable",
   "function_declaration_statement", "class_declaration_statement",
-  "is_reference", "unticked_function_declaration_statement", "@29",
-  "unticked_class_declaration_statement", "@30", "@31", "class_entry_type",
-  "extends_from", "interface_entry", "interface_extends_list",
-  "implements_list", "interface_list", "foreach_optional_arg",
-  "foreach_variable", "for_statement", "foreach_statement",
-  "declare_statement", "declare_list", "switch_case_list", "case_list",
-  "@32", "@33", "case_separator", "while_statement", "elseif_list", "@34",
-  "new_elseif_list", "@35", "else_single", "new_else_single",
-  "parameter_list", "non_empty_parameter_list", "optional_class_type",
+  "is_reference", "unticked_function_declaration_statement", "$@29",
+  "unticked_class_declaration_statement", "$@30", "$@31",
+  "class_entry_type", "extends_from", "interface_entry",
+  "interface_extends_list", "implements_list", "interface_list",
+  "foreach_optional_arg", "foreach_variable", "for_statement",
+  "foreach_statement", "declare_statement", "declare_list",
+  "switch_case_list", "case_list", "$@32", "$@33", "case_separator",
+  "while_statement", "elseif_list", "$@34", "new_elseif_list", "$@35",
+  "else_single", "new_else_single", "parameter_list",
+  "non_empty_parameter_list", "optional_class_type",
   "function_call_parameter_list", "non_empty_function_call_parameter_list",
   "global_var_list", "global_var", "static_var_list",
-  "class_statement_list", "class_statement", "@36", "@37",
+  "class_statement_list", "class_statement", "$@36", "$@37",
   "trait_use_statement", "trait_list", "trait_adaptations",
   "trait_adaptation_list", "non_empty_trait_adaptation_list",
   "trait_adaptation_statement", "trait_precedence", "trait_reference_list",
@@ -1083,32 +1117,33 @@ static const char *const yytname[] =
   "trait_alias", "trait_modifiers", "method_body", "variable_modifiers",
   "method_modifiers", "non_empty_member_modifiers", "member_modifier",
   "class_variable_declaration", "class_constant_declaration",
-  "echo_expr_list", "for_expr", "non_empty_for_expr", "@38",
+  "echo_expr_list", "for_expr", "non_empty_for_expr", "$@38",
   "chaining_method_or_property", "chaining_dereference",
-  "chaining_instance_call", "@39", "instance_call", "@40", "new_expr",
-  "@41", "expr_without_variable", "@42", "@43", "@44", "@45", "@46", "@47",
-  "@48", "@49", "@50", "@51", "@52", "@53", "@54", "function",
-  "lexical_vars", "lexical_var_list", "function_call", "@55", "@56", "@57",
-  "@58", "@59", "@60", "@61", "@62", "class_name",
+  "chaining_instance_call", "$@39", "instance_call", "$@40", "new_expr",
+  "$@41", "expr_without_variable", "$@42", "$@43", "$@44", "$@45", "$@46",
+  "$@47", "@48", "$@49", "$@50", "$@51", "$@52", "@53", "@54", "function",
+  "lexical_vars", "lexical_var_list", "function_call", "$@55", "$@56",
+  "$@57", "$@58", "$@59", "$@60", "$@61", "$@62", "class_name",
   "fully_qualified_class_name", "class_name_reference",
-  "dynamic_class_name_reference", "@63", "@64",
+  "dynamic_class_name_reference", "$@63", "$@64",
   "dynamic_class_name_variable_properties",
   "dynamic_class_name_variable_property", "exit_expr", "backticks_expr",
   "ctor_arguments", "common_scalar", "static_scalar",
   "static_class_constant", "scalar", "static_array_pair_list",
   "possible_comma", "non_empty_static_array_pair_list", "expr",
-  "r_variable", "w_variable", "rw_variable", "variable", "@65", "@66",
-  "variable_properties", "variable_property", "@67",
-  "array_method_dereference", "method", "@68", "method_or_not",
+  "r_variable", "w_variable", "rw_variable", "variable", "$@65", "$@66",
+  "variable_properties", "variable_property", "$@67",
+  "array_method_dereference", "method", "$@68", "method_or_not",
   "variable_without_objects", "static_member", "variable_class_name",
-  "array_function_dereference", "@69", "base_variable_with_function_calls",
-  "base_variable", "reference_variable", "compound_variable", "dim_offset",
-  "object_property", "@70", "object_dim_list", "variable_name",
+  "array_function_dereference", "$@69",
+  "base_variable_with_function_calls", "base_variable",
+  "reference_variable", "compound_variable", "dim_offset",
+  "object_property", "$@70", "object_dim_list", "variable_name",
   "simple_indirect_reference", "assignment_list",
-  "assignment_list_element", "@71", "array_pair_list",
-  "non_empty_array_pair_list", "encaps_list", "encaps_var", "@72",
+  "assignment_list_element", "$@71", "array_pair_list",
+  "non_empty_array_pair_list", "encaps_list", "encaps_var", "$@72",
   "encaps_var_offset", "internal_functions_in_yacc", "isset_variables",
-  "@73", "class_constant", 0
+  "$@73", "class_constant", YY_NULL
 };
 #endif
 
@@ -1250,8 +1285,8 @@ static const yytype_uint8 yyr2[] =
        2,     2,     1,     0,     4,     3,     3
 };
 
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
+   Performed when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
@@ -1516,8 +1551,7 @@ static const yytype_int16 yypgoto[] =
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
+   number is the opposite.  If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -472
 static const yytype_int16 yytable[] =
 {
@@ -2055,6 +2089,12 @@ static const yytype_int16 yytable[] =
      259,     0,   260
 };
 
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-736)))
+
+#define yytable_value_is_error(Yytable_value) \
+  (!!((Yytable_value) == (-472)))
+
 static const yytype_int16 yycheck[] =
 {
       23,    24,     4,   234,    27,   119,    27,   577,     4,   373,
@@ -2708,78 +2748,50 @@ static const yytype_uint16 yystos[] =
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
+   Once GCC version 2 has supplanted version 1, this can go.  However,
+   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
+   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
+   discussed.  */
 
 #define YYFAIL		goto yyerrlab
+#if defined YYFAIL
+  /* This is here to suppress warnings from the GCC cpp's
+     -Wunused-macros.  Normally we don't worry about that warning, but
+     some users do, and we want to make it easy for users to remove
+     YYFAIL uses, which will produce warnings from Bison 2.5.  */
+#endif
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)					\
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    {								\
-      yychar = (Token);						\
-      yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
-      YYPOPSTACK (1);						\
-      goto yybackup;						\
-    }								\
-  else								\
-    {								\
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
       yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
 while (YYID (0))
 
-
+/* Error token number */
 #define YYTERROR	1
 #define YYERRCODE	256
 
 
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
-   If N is 0, then set CURRENT to the empty location which ends
-   the previous symbol: RHS[0] (always defined).  */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)				\
-    do									\
-      if (YYID (N))                                                    \
-	{								\
-	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
-	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
-	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
-	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
-	}								\
-      else								\
-	{								\
-	  (Current).first_line   = (Current).last_line   =		\
-	    YYRHSLOC (Rhs, 0).last_line;				\
-	  (Current).first_column = (Current).last_column =		\
-	    YYRHSLOC (Rhs, 0).last_column;				\
-	}								\
-    while (YYID (0))
-#endif
-
-
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
-
+/* This macro is provided for backward compatibility. */
 #ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)			\
-     fprintf (File, "%d.%d-%d.%d",			\
-	      (Loc).first_line, (Loc).first_column,	\
-	      (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
 #endif
 
 
 /* YYLEX -- calling `yylex' with the right arguments.  */
-
 #ifdef YYLEX_PARAM
 # define YYLEX yylex (&yylval, YYLEX_PARAM)
 #else
@@ -2829,6 +2841,8 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
     YYSTYPE const * const yyvaluep;
 #endif
 {
+  FILE *yyo = yyoutput;
+  YYUSE (yyo);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
@@ -2840,7 +2854,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
   switch (yytype)
     {
       default:
-	break;
+        break;
     }
 }
 
@@ -2878,17 +2892,20 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
 #else
 static void
-yy_stack_print (bottom, top)
-    yytype_int16 *bottom;
-    yytype_int16 *top;
+yy_stack_print (yybottom, yytop)
+    yytype_int16 *yybottom;
+    yytype_int16 *yytop;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (; bottom <= top; ++bottom)
-    YYFPRINTF (stderr, " %d", *bottom);
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
   YYFPRINTF (stderr, "\n");
 }
 
@@ -2922,11 +2939,11 @@ yy_reduce_print (yyvsp, yyrule)
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
-      fprintf (stderr, "   $%d = ", yyi + 1);
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
 		       		       );
-      fprintf (stderr, "\n");
+      YYFPRINTF (stderr, "\n");
     }
 }
 
@@ -2963,7 +2980,6 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
-
 
 #if YYERROR_VERBOSE
 
@@ -3066,115 +3082,145 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
 
-/* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
-   including the terminating null byte.  If YYRESULT is null, do not
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
-{
-  int yyn = yypact[yystate];
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
 
-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
-    return 0;
-  else
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULL;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - Assume YYFAIL is not used.  It's too flawed to consider.  See
+       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
+       for details.  YYERROR is fine as it does not invoke this
+       function.
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
     {
-      int yytype = YYTRANSLATE (yychar);
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-      YYSIZE_T yysize = yysize0;
-      YYSIZE_T yysize1;
-      int yysize_overflow = 0;
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-      int yyx;
-
-# if 0
-      /* This is so xgettext sees the translatable formats that are
-	 constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
-      char *yyfmt;
-      char const *yyf;
-      static char const yyunexpected[] = "syntax error, unexpected %s";
-      static char const yyexpecting[] = ", expecting %s";
-      static char const yyor[] = " or %s";
-      char yyformat[sizeof yyunexpected
-		    + sizeof yyexpecting - 1
-		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-		       * (sizeof yyor - 1))];
-      char const *yyprefix = yyexpecting;
-
-      /* Start YYX at -YYN if negative to avoid negative indexes in
-	 YYCHECK.  */
-      int yyxbegin = yyn < 0 ? -yyn : 0;
-
-      /* Stay within bounds of both yycheck and yytname.  */
-      int yychecklim = YYLAST - yyn + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      int yycount = 1;
-
-      yyarg[0] = yytname[yytype];
-      yyfmt = yystpcpy (yyformat, yyunexpected);
-
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	  {
-	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-	      {
-		yycount = 1;
-		yysize = yysize0;
-		yyformat[sizeof yyunexpected - 1] = '\0';
-		break;
-	      }
-	    yyarg[yycount++] = yytname[yyx];
-	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-	    yysize_overflow |= (yysize1 < yysize);
-	    yysize = yysize1;
-	    yyfmt = yystpcpy (yyfmt, yyprefix);
-	    yyprefix = yyor;
-	  }
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
+              }
+        }
+    }
 
-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
-      yysize_overflow |= (yysize1 < yysize);
-      yysize = yysize1;
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
 
-      if (yysize_overflow)
-	return YYSIZE_MAXIMUM;
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
 
-      if (yyresult)
-	{
-	  /* Avoid sprintf, as that infringes on the user's name space.
-	     Don't have undefined behavior even if the translation
-	     produced a string with the wrong number of "%s"s.  */
-	  char *yyp = yyresult;
-	  int yyi = 0;
-	  while ((*yyp = *yyf) != '\0')
-	    {
-	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		{
-		  yyp += yytnamerr (yyp, yyarg[yyi++]);
-		  yyf += 2;
-		}
-	      else
-		{
-		  yyp++;
-		  yyf++;
-		}
-	    }
-	}
-      return yysize;
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
     }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
 }
 #endif /* YYERROR_VERBOSE */
-
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
@@ -3203,28 +3249,9 @@ yydestruct (yymsg, yytype, yyvaluep)
     {
 
       default:
-	break;
+        break;
     }
 }
-
-
-/* Prevent warnings from -Wmissing-prototypes.  */
-
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-
 
 
 
@@ -3255,77 +3282,92 @@ yyparse ()
 #endif
 #endif
 {
-  /* The look-ahead symbol.  */
+/* The lookahead symbol.  */
 int yychar;
 
-/* The semantic value of the look-ahead symbol.  */
-YYSTYPE yylval;
 
-/* Number of syntax errors so far.  */
-int yynerrs;
-
-  int yystate;
-  int yyn;
-  int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Look-ahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
+#else
+/* Default value used for initialization, for pacifying older GCCs
+   or non-GCC compilers.  */
+static YYSTYPE yyval_default;
+# define YY_INITIAL_VALUE(Value) = Value
+#endif
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
 #endif
 
-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
 
-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
+    /* Number of syntax errors so far.  */
+    int yynerrs;
 
-  /* The state stack.  */
-  yytype_int16 yyssa[YYINITDEPTH];
-  yytype_int16 *yyss = yyssa;
-  yytype_int16 *yyssp;
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
 
-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  YYSTYPE *yyvsp;
+    /* The stacks and their tools:
+       `yyss': related to states.
+       `yyvs': related to semantic values.
 
+       Refer to the stacks through separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
 
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
 
-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
 
-  YYSIZE_T yystacksize = YYINITDEPTH;
+    YYSIZE_T yystacksize;
 
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken = 0;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
 
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-
-  yyssp = yyss;
-  yyvsp = yyvs;
-
+  yychar = YYEMPTY; /* Cause a token to be read.  */
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -3352,7 +3394,6 @@ int yynerrs;
 	YYSTYPE *yyvs1 = yyvs;
 	yytype_int16 *yyss1 = yyss;
 
-
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
@@ -3360,7 +3401,6 @@ int yynerrs;
 	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
-
 		    &yystacksize);
 
 	yyss = yyss1;
@@ -3383,9 +3423,8 @@ int yynerrs;
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
 	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss);
-	YYSTACK_RELOCATE (yyvs);
-
+	YYSTACK_RELOCATE (yyss_alloc, yyss);
+	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
@@ -3396,7 +3435,6 @@ int yynerrs;
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
-
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
@@ -3406,6 +3444,9 @@ int yynerrs;
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
   goto yybackup;
 
 /*-----------.
@@ -3414,16 +3455,16 @@ int yynerrs;
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a
-     look-ahead token if we need one and don't already have one.  */
+     lookahead token if we need one and don't already have one.  */
 
-  /* First try to decide what to do without reference to look-ahead token.  */
+  /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
+  if (yypact_value_is_default (yyn))
     goto yydefault;
 
-  /* Not known => get a look-ahead token if don't already have one.  */
+  /* Not known => get a lookahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -3449,29 +3490,27 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
-	goto yyerrlab;
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
-  /* Shift the look-ahead token.  */
+  /* Shift the lookahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the shifted token unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
 
   yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
   goto yynewstate;
 
@@ -5790,10 +5829,20 @@ yyreduce:
     break;
 
 
-/* Line 1267 of yacc.c.  */
 
       default: break;
     }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
@@ -5802,7 +5851,6 @@ yyreduce:
 
   *++yyvsp = yyval;
 
-
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
@@ -5822,6 +5870,10 @@ yyreduce:
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
@@ -5829,37 +5881,36 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
       {
-	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-	  {
-	    YYSIZE_T yyalloc = 2 * yysize;
-	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
-	    if (yymsg != yymsgbuf)
-	      YYSTACK_FREE (yymsg);
-	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-	    if (yymsg)
-	      yymsg_alloc = yyalloc;
-	    else
-	      {
-		yymsg = yymsgbuf;
-		yymsg_alloc = sizeof yymsgbuf;
-	      }
-	  }
-
-	if (0 < yysize && yysize <= yymsg_alloc)
-	  {
-	    (void) yysyntax_error (yymsg, yystate, yychar);
-	    yyerror (yymsg);
-	  }
-	else
-	  {
-	    yyerror (YY_("syntax error"));
-	    if (yysize != 0)
-	      goto yyexhaustedlab;
-	  }
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
       }
+# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -5867,7 +5918,7 @@ yyerrlab:
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse look-ahead token after an
+      /* If just tried and failed to reuse lookahead token after an
 	 error, discard it.  */
 
       if (yychar <= YYEOF)
@@ -5884,7 +5935,7 @@ yyerrlab:
 	}
     }
 
-  /* Else will try to reuse look-ahead token after shifting the error
+  /* Else will try to reuse lookahead token after shifting the error
      token.  */
   goto yyerrlab1;
 
@@ -5918,7 +5969,7 @@ yyerrlab1:
   for (;;)
     {
       yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
+      if (!yypact_value_is_default (yyn))
 	{
 	  yyn += YYTERROR;
 	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
@@ -5941,10 +5992,9 @@ yyerrlab1:
       YY_STACK_PRINT (yyss, yyssp);
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
 
   /* Shift the error token.  */
@@ -5968,7 +6018,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#ifndef yyoverflow
+#if !defined yyoverflow || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -5979,9 +6029,14 @@ yyexhaustedlab:
 #endif
 
 yyreturn:
-  if (yychar != YYEOF && yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
-		 yytoken, &yylval);
+  if (yychar != YYEMPTY)
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval);
+    }
   /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
@@ -6083,4 +6138,3 @@ static YYSIZE_T zend_yytnamerr(char *yyres, const char *yystr)
  * indent-tabs-mode: t
  * End:
  */
-
diff --git a/Zend/zend_language_parser.h b/Zend/zend_language_parser.h
index 152ff00e7..8b3cd6c34 100644
--- a/Zend/zend_language_parser.h
+++ b/Zend/zend_language_parser.h
@@ -1,24 +1,21 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
+/* A Bison parser, made by GNU Bison 2.7.  */
 
-/* Skeleton interface for Bison's Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
+/* Bison interface for Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
+   
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -29,10 +26,30 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
+#ifndef YY_ZEND_ZEND_ZEND_LANGUAGE_PARSER_H_INCLUDED
+# define YY_ZEND_ZEND_ZEND_LANGUAGE_PARSER_H_INCLUDED
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int zenddebug;
+#endif
+/* "%code requires" blocks.  */
+
+
+#ifdef ZTS
+# define YYPARSE_PARAM tsrm_ls
+# define YYLEX_PARAM tsrm_ls
+#endif
+
+
+
+
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
@@ -301,13 +318,26 @@
 
 
 
-
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int zendparse (void *YYPARSE_PARAM);
+#else
+int zendparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int zendparse (void);
+#else
+int zendparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
 
+#endif /* !YY_ZEND_ZEND_ZEND_LANGUAGE_PARSER_H_INCLUDED  */
diff --git a/Zend/zend_language_parser.output b/Zend/zend_language_parser.output
index a67c1a458..baea4b6ff 100644
--- a/Zend/zend_language_parser.output
+++ b/Zend/zend_language_parser.output
@@ -1,4 +1,4 @@
-Terminals which are not used
+Terminals unused in grammar
 
    T_CHARACTER
    T_BAD_CHARACTER
@@ -20,9 +20,9 @@ Grammar
 
     1 start: top_statement_list
 
-    2 @1: /* empty */
+    2 $@1: /* empty */
 
-    3 top_statement_list: top_statement_list @1 top_statement
+    3 top_statement_list: top_statement_list $@1 top_statement
     4                   | /* empty */
 
     5 namespace_name: "identifier (T_STRING)"
@@ -34,13 +34,13 @@ Grammar
    10              | "__halt_compiler (T_HALT_COMPILER)" '(' ')' ';'
    11              | "namespace (T_NAMESPACE)" namespace_name ';'
 
-   12 @2: /* empty */
+   12 $@2: /* empty */
 
-   13 top_statement: "namespace (T_NAMESPACE)" namespace_name '{' @2 top_statement_list '}'
+   13 top_statement: "namespace (T_NAMESPACE)" namespace_name '{' $@2 top_statement_list '}'
 
-   14 @3: /* empty */
+   14 $@3: /* empty */
 
-   15 top_statement: "namespace (T_NAMESPACE)" '{' @3 top_statement_list '}'
+   15 top_statement: "namespace (T_NAMESPACE)" '{' $@3 top_statement_list '}'
    16              | "use (T_USE)" use_declarations ';'
    17              | constant_declaration ';'
 
@@ -55,9 +55,9 @@ Grammar
    24 constant_declaration: constant_declaration ',' "identifier (T_STRING)" '=' static_scalar
    25                     | "const (T_CONST)" "identifier (T_STRING)" '=' static_scalar
 
-   26 @4: /* empty */
+   26 $@4: /* empty */
 
-   27 inner_statement_list: inner_statement_list @4 inner_statement
+   27 inner_statement_list: inner_statement_list $@4 inner_statement
    28                     | /* empty */
 
    29 inner_statement: statement
@@ -70,41 +70,41 @@ Grammar
 
    35 unticked_statement: '{' inner_statement_list '}'
 
-   36 @5: /* empty */
+   36 $@5: /* empty */
 
-   37 @6: /* empty */
+   37 $@6: /* empty */
 
-   38 unticked_statement: "if (T_IF)" '(' expr ')' @5 statement @6 elseif_list else_single
+   38 unticked_statement: "if (T_IF)" '(' expr ')' $@5 statement $@6 elseif_list else_single
 
-   39 @7: /* empty */
+   39 $@7: /* empty */
 
-   40 @8: /* empty */
+   40 $@8: /* empty */
 
-   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' @7 inner_statement_list @8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
+   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' $@7 inner_statement_list $@8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
 
-   42 @9: /* empty */
+   42 $@9: /* empty */
 
-   43 @10: /* empty */
+   43 $@10: /* empty */
 
-   44 unticked_statement: "while (T_WHILE)" '(' @9 expr ')' @10 while_statement
+   44 unticked_statement: "while (T_WHILE)" '(' $@9 expr ')' $@10 while_statement
 
-   45 @11: /* empty */
+   45 $@11: /* empty */
 
-   46 @12: /* empty */
+   46 $@12: /* empty */
 
-   47 unticked_statement: "do (T_DO)" @11 statement "while (T_WHILE)" '(' @12 expr ')' ';'
+   47 unticked_statement: "do (T_DO)" $@11 statement "while (T_WHILE)" '(' $@12 expr ')' ';'
 
-   48 @13: /* empty */
+   48 $@13: /* empty */
 
-   49 @14: /* empty */
+   49 $@14: /* empty */
 
-   50 @15: /* empty */
+   50 $@15: /* empty */
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' @13 for_expr ';' @14 for_expr ')' @15 for_statement
+   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' $@13 for_expr ';' $@14 for_expr ')' $@15 for_statement
 
-   52 @16: /* empty */
+   52 $@16: /* empty */
 
-   53 unticked_statement: "switch (T_SWITCH)" '(' expr ')' @16 switch_case_list
+   53 unticked_statement: "switch (T_SWITCH)" '(' expr ')' $@16 switch_case_list
    54                   | "break (T_BREAK)" ';'
    55                   | "break (T_BREAK)" expr ';'
    56                   | "continue (T_CONTINUE)" ';'
@@ -119,34 +119,34 @@ Grammar
    65                   | expr ';'
    66                   | "unset (T_UNSET)" '(' unset_variables ')' ';'
 
-   67 @17: /* empty */
+   67 $@17: /* empty */
 
-   68 @18: /* empty */
+   68 $@18: /* empty */
 
-   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" @17 foreach_variable foreach_optional_arg ')' @18 foreach_statement
+   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" $@17 foreach_variable foreach_optional_arg ')' $@18 foreach_statement
 
-   70 @19: /* empty */
+   70 $@19: /* empty */
 
-   71 @20: /* empty */
+   71 $@20: /* empty */
 
-   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" @19 variable foreach_optional_arg ')' @20 foreach_statement
+   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" $@19 variable foreach_optional_arg ')' $@20 foreach_statement
 
-   73 @21: /* empty */
+   73 $@21: /* empty */
 
-   74 unticked_statement: "declare (T_DECLARE)" @21 '(' declare_list ')' declare_statement
+   74 unticked_statement: "declare (T_DECLARE)" $@21 '(' declare_list ')' declare_statement
    75                   | ';'
 
-   76 @22: /* empty */
+   76 $@22: /* empty */
 
-   77 @23: /* empty */
+   77 $@23: /* empty */
 
-   78 @24: /* empty */
+   78 $@24: /* empty */
 
-   79 @25: /* empty */
+   79 $@25: /* empty */
 
-   80 @26: /* empty */
+   80 $@26: /* empty */
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
    82                   | "throw (T_THROW)" expr ';'
    83                   | "goto (T_GOTO)" "identifier (T_STRING)" ';'
 
@@ -158,9 +158,9 @@ Grammar
 
    88 @27: /* empty */
 
-   89 @28: /* empty */
+   89 $@28: /* empty */
 
-   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' @28 '{' inner_statement_list '}'
+   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' $@28 '{' inner_statement_list '}'
 
    91 unset_variables: unset_variable
    92                | unset_variables ',' unset_variable
@@ -174,17 +174,17 @@ Grammar
    96 is_reference: /* empty */
    97             | '&'
 
-   98 @29: /* empty */
+   98 $@29: /* empty */
 
-   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" @29 '(' parameter_list ')' '{' inner_statement_list '}'
+   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" $@29 '(' parameter_list ')' '{' inner_statement_list '}'
 
-  100 @30: /* empty */
+  100 $@30: /* empty */
 
-  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from @30 implements_list '{' class_statement_list '}'
+  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from $@30 implements_list '{' class_statement_list '}'
 
-  102 @31: /* empty */
+  102 $@31: /* empty */
 
-  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" @31 interface_extends_list '{' class_statement_list '}'
+  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" $@31 interface_extends_list '{' class_statement_list '}'
 
   104 class_entry_type: "class (T_CLASS)"
   105                 | "abstract (T_ABSTRACT)" "class (T_CLASS)"
@@ -230,13 +230,13 @@ Grammar
 
   133 case_list: /* empty */
 
-  134 @32: /* empty */
+  134 $@32: /* empty */
 
-  135 case_list: case_list "case (T_CASE)" expr case_separator @32 inner_statement_list
+  135 case_list: case_list "case (T_CASE)" expr case_separator $@32 inner_statement_list
 
-  136 @33: /* empty */
+  136 $@33: /* empty */
 
-  137 case_list: case_list "default (T_DEFAULT)" case_separator @33 inner_statement_list
+  137 case_list: case_list "default (T_DEFAULT)" case_separator $@33 inner_statement_list
 
   138 case_separator: ':'
   139               | ';'
@@ -246,15 +246,15 @@ Grammar
 
   142 elseif_list: /* empty */
 
-  143 @34: /* empty */
+  143 $@34: /* empty */
 
-  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' expr ')' @34 statement
+  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' expr ')' $@34 statement
 
   145 new_elseif_list: /* empty */
 
-  146 @35: /* empty */
+  146 $@35: /* empty */
 
-  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr ')' ':' @35 inner_statement_list
+  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr ')' ':' $@35 inner_statement_list
 
   148 else_single: /* empty */
   149            | "else (T_ELSE)" statement
@@ -304,15 +304,15 @@ Grammar
   183 class_statement_list: class_statement_list class_statement
   184                     | /* empty */
 
-  185 @36: /* empty */
+  185 $@36: /* empty */
 
-  186 class_statement: variable_modifiers @36 class_variable_declaration ';'
+  186 class_statement: variable_modifiers $@36 class_variable_declaration ';'
   187                | class_constant_declaration ';'
   188                | trait_use_statement
 
-  189 @37: /* empty */
+  189 $@37: /* empty */
 
-  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" @37 '(' parameter_list ')' method_body
+  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" $@37 '(' parameter_list ')' method_body
 
   191 trait_use_statement: "use (T_USE)" trait_list trait_adaptations
 
@@ -380,9 +380,9 @@ Grammar
   234 for_expr: /* empty */
   235         | non_empty_for_expr
 
-  236 @38: /* empty */
+  236 $@38: /* empty */
 
-  237 non_empty_for_expr: non_empty_for_expr ',' @38 expr
+  237 non_empty_for_expr: non_empty_for_expr ',' $@38 expr
   238                   | expr
 
   239 chaining_method_or_property: chaining_method_or_property variable_property
@@ -391,31 +391,31 @@ Grammar
   241 chaining_dereference: chaining_dereference '[' dim_offset ']'
   242                     | '[' dim_offset ']'
 
-  243 @39: /* empty */
+  243 $@39: /* empty */
 
-  244 chaining_instance_call: chaining_dereference @39 chaining_method_or_property
+  244 chaining_instance_call: chaining_dereference $@39 chaining_method_or_property
   245                       | chaining_dereference
   246                       | chaining_method_or_property
 
   247 instance_call: /* empty */
 
-  248 @40: /* empty */
+  248 $@40: /* empty */
 
-  249 instance_call: @40 chaining_instance_call
+  249 instance_call: $@40 chaining_instance_call
 
-  250 @41: /* empty */
+  250 $@41: /* empty */
 
-  251 new_expr: "new (T_NEW)" class_name_reference @41 ctor_arguments
+  251 new_expr: "new (T_NEW)" class_name_reference $@41 ctor_arguments
 
-  252 @42: /* empty */
+  252 $@42: /* empty */
 
-  253 expr_without_variable: "list (T_LIST)" '(' @42 assignment_list ')' '=' expr
+  253 expr_without_variable: "list (T_LIST)" '(' $@42 assignment_list ')' '=' expr
   254                      | variable '=' expr
   255                      | variable '=' '&' variable
 
-  256 @43: /* empty */
+  256 $@43: /* empty */
 
-  257 expr_without_variable: variable '=' '&' "new (T_NEW)" class_name_reference @43 ctor_arguments
+  257 expr_without_variable: variable '=' '&' "new (T_NEW)" class_name_reference $@43 ctor_arguments
   258                      | "clone (T_CLONE)" expr
   259                      | variable "+= (T_PLUS_EQUAL)" expr
   260                      | variable "-= (T_MINUS_EQUAL)" expr
@@ -433,21 +433,21 @@ Grammar
   272                      | rw_variable "-- (T_DEC)"
   273                      | "-- (T_DEC)" rw_variable
 
-  274 @44: /* empty */
+  274 $@44: /* empty */
 
-  275 expr_without_variable: expr "|| (T_BOOLEAN_OR)" @44 expr
+  275 expr_without_variable: expr "|| (T_BOOLEAN_OR)" $@44 expr
 
-  276 @45: /* empty */
+  276 $@45: /* empty */
 
-  277 expr_without_variable: expr "&& (T_BOOLEAN_AND)" @45 expr
+  277 expr_without_variable: expr "&& (T_BOOLEAN_AND)" $@45 expr
 
-  278 @46: /* empty */
+  278 $@46: /* empty */
 
-  279 expr_without_variable: expr "or (T_LOGICAL_OR)" @46 expr
+  279 expr_without_variable: expr "or (T_LOGICAL_OR)" $@46 expr
 
-  280 @47: /* empty */
+  280 $@47: /* empty */
 
-  281 expr_without_variable: expr "and (T_LOGICAL_AND)" @47 expr
+  281 expr_without_variable: expr "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr "xor (T_LOGICAL_XOR)" expr
   283                      | expr '|' expr
   284                      | expr '&' expr
@@ -480,15 +480,15 @@ Grammar
 
   310 expr_without_variable: '(' new_expr ')' @48 instance_call
 
-  311 @49: /* empty */
+  311 $@49: /* empty */
 
-  312 @50: /* empty */
+  312 $@50: /* empty */
 
-  313 expr_without_variable: expr '?' @49 expr ':' @50 expr
+  313 expr_without_variable: expr '?' $@49 expr ':' $@50 expr
 
-  314 @51: /* empty */
+  314 $@51: /* empty */
 
-  315 expr_without_variable: expr '?' ':' @51 expr
+  315 expr_without_variable: expr '?' ':' $@51 expr
   316                      | internal_functions_in_yacc
   317                      | "(int) (T_INT_CAST)" expr
   318                      | "(double) (T_DOUBLE_CAST)" expr
@@ -499,9 +499,9 @@ Grammar
   323                      | "(unset) (T_UNSET_CAST)" expr
   324                      | "exit (T_EXIT)" exit_expr
 
-  325 @52: /* empty */
+  325 $@52: /* empty */
 
-  326 expr_without_variable: '@' @52 expr
+  326 expr_without_variable: '@' $@52 expr
   327                      | scalar
   328                      | "array (T_ARRAY)" '(' array_pair_list ')'
   329                      | '[' array_pair_list ']'
@@ -526,37 +526,37 @@ Grammar
   341                 | "variable (T_VARIABLE)"
   342                 | '&' "variable (T_VARIABLE)"
 
-  343 @55: /* empty */
+  343 $@55: /* empty */
 
-  344 function_call: namespace_name '(' @55 function_call_parameter_list ')'
+  344 function_call: namespace_name '(' $@55 function_call_parameter_list ')'
 
-  345 @56: /* empty */
+  345 $@56: /* empty */
 
-  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name '(' @56 function_call_parameter_list ')'
+  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name '(' $@56 function_call_parameter_list ')'
 
-  347 @57: /* empty */
+  347 $@57: /* empty */
 
-  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name '(' @57 function_call_parameter_list ')'
+  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name '(' $@57 function_call_parameter_list ')'
 
-  349 @58: /* empty */
+  349 $@58: /* empty */
 
-  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @58 function_call_parameter_list ')'
+  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@58 function_call_parameter_list ')'
 
-  351 @59: /* empty */
+  351 $@59: /* empty */
 
-  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @59 function_call_parameter_list ')'
+  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@59 function_call_parameter_list ')'
 
-  353 @60: /* empty */
+  353 $@60: /* empty */
 
-  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @60 function_call_parameter_list ')'
+  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@60 function_call_parameter_list ')'
 
-  355 @61: /* empty */
+  355 $@61: /* empty */
 
-  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @61 function_call_parameter_list ')'
+  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@61 function_call_parameter_list ')'
 
-  357 @62: /* empty */
+  357 $@62: /* empty */
 
-  358 function_call: variable_without_objects '(' @62 function_call_parameter_list ')'
+  358 function_call: variable_without_objects '(' $@62 function_call_parameter_list ')'
 
   359 class_name: "static (T_STATIC)"
   360           | namespace_name
@@ -570,11 +570,11 @@ Grammar
   366 class_name_reference: class_name
   367                     | dynamic_class_name_reference
 
-  368 @63: /* empty */
+  368 $@63: /* empty */
 
-  369 @64: /* empty */
+  369 $@64: /* empty */
 
-  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" @63 object_property @64 dynamic_class_name_variable_properties
+  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" $@63 object_property $@64 dynamic_class_name_variable_properties
   371                             | base_variable
 
   372 dynamic_class_name_variable_properties: dynamic_class_name_variable_properties dynamic_class_name_variable_property
@@ -649,26 +649,26 @@ Grammar
 
   427 rw_variable: variable
 
-  428 @65: /* empty */
+  428 $@65: /* empty */
 
-  429 @66: /* empty */
+  429 $@66: /* empty */
 
-  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" @65 object_property @66 method_or_not variable_properties
+  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" $@65 object_property $@66 method_or_not variable_properties
   431         | base_variable_with_function_calls
 
   432 variable_properties: variable_properties variable_property
   433                    | /* empty */
 
-  434 @67: /* empty */
+  434 $@67: /* empty */
 
-  435 variable_property: "-> (T_OBJECT_OPERATOR)" object_property @67 method_or_not
+  435 variable_property: "-> (T_OBJECT_OPERATOR)" object_property $@67 method_or_not
 
   436 array_method_dereference: array_method_dereference '[' dim_offset ']'
   437                         | method '[' dim_offset ']'
 
-  438 @68: /* empty */
+  438 $@68: /* empty */
 
-  439 method: '(' @68 function_call_parameter_list ')'
+  439 method: '(' $@68 function_call_parameter_list ')'
 
   440 method_or_not: method
   441              | array_method_dereference
@@ -684,9 +684,9 @@ Grammar
 
   448 array_function_dereference: array_function_dereference '[' dim_offset ']'
 
-  449 @69: /* empty */
+  449 $@69: /* empty */
 
-  450 array_function_dereference: function_call @69 '[' dim_offset ']'
+  450 array_function_dereference: function_call $@69 '[' dim_offset ']'
 
   451 base_variable_with_function_calls: base_variable
   452                                  | array_function_dereference
@@ -708,9 +708,9 @@ Grammar
 
   464 object_property: object_dim_list
 
-  465 @70: /* empty */
+  465 $@70: /* empty */
 
-  466 object_property: variable_without_objects @70
+  466 object_property: variable_without_objects $@70
 
   467 object_dim_list: object_dim_list '[' dim_offset ']'
   468                | object_dim_list '{' expr '}'
@@ -727,9 +727,9 @@ Grammar
 
   476 assignment_list_element: variable
 
-  477 @71: /* empty */
+  477 $@71: /* empty */
 
-  478 assignment_list_element: "list (T_LIST)" '(' @71 assignment_list ')'
+  478 assignment_list_element: "list (T_LIST)" '(' $@71 assignment_list ')'
   479                        | /* empty */
 
   480 array_pair_list: /* empty */
@@ -751,9 +751,9 @@ Grammar
 
   494 encaps_var: "variable (T_VARIABLE)"
 
-  495 @72: /* empty */
+  495 $@72: /* empty */
 
-  496 encaps_var: "variable (T_VARIABLE)" '[' @72 encaps_var_offset ']'
+  496 encaps_var: "variable (T_VARIABLE)" '[' $@72 encaps_var_offset ']'
   497           | "variable (T_VARIABLE)" "-> (T_OBJECT_OPERATOR)" "identifier (T_STRING)"
   498           | "${ (T_DOLLAR_OPEN_CURLY_BRACES)" expr '}'
   499           | "${ (T_DOLLAR_OPEN_CURLY_BRACES)" "variable name (T_STRING_VARNAME)" '[' expr ']' '}'
@@ -773,9 +773,9 @@ Grammar
 
   511 isset_variables: variable
 
-  512 @73: /* empty */
+  512 $@73: /* empty */
 
-  513 isset_variables: isset_variables ',' @73 variable
+  513 isset_variables: isset_variables ',' $@73 variable
 
   514 class_constant: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" "identifier (T_STRING)"
   515               | variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" "identifier (T_STRING)"
@@ -883,8 +883,8 @@ error (256)
 T_INLINE_HTML (311) 64
 T_CHARACTER (312)
 T_BAD_CHARACTER (313)
-"quoted-string and whitespace (T_ENCAPSED_AND_WHITESPACE)"
-    (314) 379 393 491 493
+"quoted-string and whitespace (T_ENCAPSED_AND_WHITESPACE)" (314) 379
+    393 491 493
 "quoted-string (T_CONSTANT_ENCAPSED_STRING)" (315) 385
 "echo (T_ECHO)" (316) 63
 "do (T_DO)" (317) 47
@@ -967,16 +967,16 @@ start (159)
     on left: 1, on right: 0
 top_statement_list (160)
     on left: 3 4, on right: 1 3 13 15
-@1 (161)
+$@1 (161)
     on left: 2, on right: 3
 namespace_name (162)
     on left: 5 6, on right: 6 11 13 20 21 22 23 344 346 348 360 361
     362 363 364 365 396 397 398 408 409 410
 top_statement (163)
     on left: 7 8 9 10 11 13 15 16 17, on right: 3
-@2 (164)
+$@2 (164)
     on left: 12, on right: 13
-@3 (165)
+$@3 (165)
     on left: 14, on right: 15
 use_declarations (166)
     on left: 18 19, on right: 16 18
@@ -987,7 +987,7 @@ constant_declaration (168)
 inner_statement_list (169)
     on left: 27 28, on right: 27 35 41 81 90 99 122 124 126 135 137
     141 147 151 213 333 335
-@4 (170)
+$@4 (170)
     on left: 26, on right: 27
 inner_statement (171)
     on left: 29 30 31 32, on right: 27
@@ -996,49 +996,49 @@ statement (172)
 unticked_statement (173)
     on left: 35 38 41 44 47 51 53 54 55 56 57 58 59 60 61 62 63 64
     65 66 69 72 74 75 81 82 83, on right: 33
-@5 (174)
+$@5 (174)
     on left: 36, on right: 38
-@6 (175)
+$@6 (175)
     on left: 37, on right: 38
-@7 (176)
+$@7 (176)
     on left: 39, on right: 41
-@8 (177)
+$@8 (177)
     on left: 40, on right: 41
-@9 (178)
+$@9 (178)
     on left: 42, on right: 44
-@10 (179)
+$@10 (179)
     on left: 43, on right: 44
-@11 (180)
+$@11 (180)
     on left: 45, on right: 47
-@12 (181)
+$@12 (181)
     on left: 46, on right: 47
-@13 (182)
+$@13 (182)
     on left: 48, on right: 51
-@14 (183)
+$@14 (183)
     on left: 49, on right: 51
-@15 (184)
+$@15 (184)
     on left: 50, on right: 51
-@16 (185)
+$@16 (185)
     on left: 52, on right: 53
-@17 (186)
+$@17 (186)
     on left: 67, on right: 69
-@18 (187)
+$@18 (187)
     on left: 68, on right: 69
-@19 (188)
+$@19 (188)
     on left: 70, on right: 72
-@20 (189)
+$@20 (189)
     on left: 71, on right: 72
-@21 (190)
+$@21 (190)
     on left: 73, on right: 74
-@22 (191)
+$@22 (191)
     on left: 76, on right: 81
-@23 (192)
+$@23 (192)
     on left: 77, on right: 81
-@24 (193)
+$@24 (193)
     on left: 78, on right: 81
-@25 (194)
+$@25 (194)
     on left: 79, on right: 81
-@26 (195)
+$@26 (195)
     on left: 80, on right: 81
 additional_catches (196)
     on left: 84 85, on right: 81
@@ -1048,7 +1048,7 @@ additional_catch (198)
     on left: 90, on right: 86 87
 @27 (199)
     on left: 88, on right: 90
-@28 (200)
+$@28 (200)
     on left: 89, on right: 90
 unset_variables (201)
     on left: 91 92, on right: 66 92
@@ -1062,13 +1062,13 @@ is_reference (205)
     on left: 96 97, on right: 99 190 333 335
 unticked_function_declaration_statement (206)
     on left: 99, on right: 94
-@29 (207)
+$@29 (207)
     on left: 98, on right: 99
 unticked_class_declaration_statement (208)
     on left: 101 103, on right: 95
-@30 (209)
+$@30 (209)
     on left: 100, on right: 101
-@31 (210)
+$@31 (210)
     on left: 102, on right: 103
 class_entry_type (211)
     on left: 104 105 106 107, on right: 101
@@ -1098,9 +1098,9 @@ switch_case_list (223)
     on left: 129 130 131 132, on right: 53
 case_list (224)
     on left: 133 135 137, on right: 129 130 131 132 135 137
-@32 (225)
+$@32 (225)
     on left: 134, on right: 135
-@33 (226)
+$@33 (226)
     on left: 136, on right: 137
 case_separator (227)
     on left: 138 139, on right: 135 137
@@ -1108,11 +1108,11 @@ while_statement (228)
     on left: 140 141, on right: 44
 elseif_list (229)
     on left: 142 144, on right: 38 144
-@34 (230)
+$@34 (230)
     on left: 143, on right: 144
 new_elseif_list (231)
     on left: 145 147, on right: 41 147
-@35 (232)
+$@35 (232)
     on left: 146, on right: 147
 else_single (233)
     on left: 148 149, on right: 38
@@ -1141,9 +1141,9 @@ class_statement_list (243)
     on left: 183 184, on right: 101 103 183
 class_statement (244)
     on left: 186 187 188 190, on right: 183
-@36 (245)
+$@36 (245)
     on left: 185, on right: 186
-@37 (246)
+$@37 (246)
     on left: 189, on right: 190
 trait_use_statement (247)
     on left: 191, on right: 188
@@ -1189,7 +1189,7 @@ for_expr (267)
     on left: 234 235, on right: 51
 non_empty_for_expr (268)
     on left: 237 238, on right: 235 237
-@38 (269)
+$@38 (269)
     on left: 236, on right: 237
 chaining_method_or_property (270)
     on left: 239 240, on right: 239 244 246
@@ -1197,15 +1197,15 @@ chaining_dereference (271)
     on left: 241 242, on right: 241 244 245
 chaining_instance_call (272)
     on left: 244 245 246, on right: 249
-@39 (273)
+$@39 (273)
     on left: 243, on right: 244
 instance_call (274)
     on left: 247 249, on right: 310
-@40 (275)
+$@40 (275)
     on left: 248, on right: 249
 new_expr (276)
     on left: 251, on right: 308 310
-@41 (277)
+$@41 (277)
     on left: 250, on right: 251
 expr_without_variable (278)
     on left: 253 254 255 257 258 259 260 261 262 263 264 265 266 267
@@ -1213,27 +1213,27 @@ expr_without_variable (278)
     288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303
     304 305 306 307 308 310 313 315 316 317 318 319 320 321 322 323
     324 326 327 328 329 330 331 333 335, on right: 59 72 168 171 424
-@42 (279)
+$@42 (279)
     on left: 252, on right: 253
-@43 (280)
+$@43 (280)
     on left: 256, on right: 257
-@44 (281)
+$@44 (281)
     on left: 274, on right: 275
-@45 (282)
+$@45 (282)
     on left: 276, on right: 277
-@46 (283)
+$@46 (283)
     on left: 278, on right: 279
-@47 (284)
+$@47 (284)
     on left: 280, on right: 281
 @48 (285)
     on left: 309, on right: 310
-@49 (286)
+$@49 (286)
     on left: 311, on right: 313
-@50 (287)
+$@50 (287)
     on left: 312, on right: 313
-@51 (288)
+$@51 (288)
     on left: 314, on right: 315
-@52 (289)
+$@52 (289)
     on left: 325, on right: 326
 @53 (290)
     on left: 332, on right: 333
@@ -1247,21 +1247,21 @@ lexical_var_list (294)
     on left: 339 340 341 342, on right: 338 339 340
 function_call (295)
     on left: 344 346 348 350 352 354 356 358, on right: 450 453
-@55 (296)
+$@55 (296)
     on left: 343, on right: 344
-@56 (297)
+$@56 (297)
     on left: 345, on right: 346
-@57 (298)
+$@57 (298)
     on left: 347, on right: 348
-@58 (299)
+$@58 (299)
     on left: 349, on right: 350
-@59 (300)
+$@59 (300)
     on left: 351, on right: 352
-@60 (301)
+$@60 (301)
     on left: 353, on right: 354
-@61 (302)
+$@61 (302)
     on left: 355, on right: 356
-@62 (303)
+$@62 (303)
     on left: 357, on right: 358
 class_name (304)
     on left: 359 360 361 362, on right: 350 352 366 405 445 514
@@ -1272,9 +1272,9 @@ class_name_reference (306)
     on left: 366 367, on right: 251 257 306
 dynamic_class_name_reference (307)
     on left: 370 371, on right: 367
-@63 (308)
+$@63 (308)
     on left: 368, on right: 370
-@64 (309)
+$@64 (309)
     on left: 369, on right: 370
 dynamic_class_name_variable_properties (310)
     on left: 372 373, on right: 370 372
@@ -1287,12 +1287,12 @@ backticks_expr (313)
 ctor_arguments (314)
     on left: 381 382, on right: 251 257
 common_scalar (315)
-    on left: 383 384 385 386 387 388 389 390 391 392 393 394,
-    on right: 395 411
+    on left: 383 384 385 386 387 388 389 390 391 392 393 394, on right:
+    395 411
 static_scalar (316)
-    on left: 395 396 397 398 399 400 401 402 403 404,
-    on right: 24 25 127 128 156 157 160 161 180 182 227 229 230 231
-    399 400 419 420 421 422
+    on left: 395 396 397 398 399 400 401 402 403 404, on right: 24
+    25 127 128 156 157 160 161 180 182 227 229 230 231 399 400 419
+    420 421 422
 static_class_constant (317)
     on left: 405, on right: 403
 scalar (318)
@@ -1320,21 +1320,21 @@ variable (326)
     on left: 430 431, on right: 60 69 72 93 119 120 169 172 254 255
     257 259 260 261 262 263 264 265 266 267 268 269 425 426 427 476
     500 505 511 513
-@65 (327)
+$@65 (327)
     on left: 428, on right: 430
-@66 (328)
+$@66 (328)
     on left: 429, on right: 430
 variable_properties (329)
     on left: 432 433, on right: 430 432
 variable_property (330)
     on left: 435, on right: 239 240 432
-@67 (331)
+$@67 (331)
     on left: 434, on right: 435
 array_method_dereference (332)
     on left: 436 437, on right: 436 441
 method (333)
     on left: 439, on right: 437 440
-@68 (334)
+$@68 (334)
     on left: 438, on right: 439
 method_or_not (335)
     on left: 440 441 442, on right: 430 435
@@ -1346,7 +1346,7 @@ variable_class_name (338)
     on left: 447, on right: 354 356 446 515
 array_function_dereference (339)
     on left: 448 450, on right: 448 452
-@69 (340)
+$@69 (340)
     on left: 449, on right: 450
 base_variable_with_function_calls (341)
     on left: 451 452 453, on right: 430 431
@@ -1360,7 +1360,7 @@ dim_offset (345)
     on left: 462 463, on right: 241 242 436 437 448 450 457 467
 object_property (346)
     on left: 464 466, on right: 370 374 430 435
-@70 (347)
+$@70 (347)
     on left: 465, on right: 466
 object_dim_list (348)
     on left: 467 468 469, on right: 464 467 468
@@ -1372,7 +1372,7 @@ assignment_list (351)
     on left: 474 475, on right: 253 474 478
 assignment_list_element (352)
     on left: 476 478 479, on right: 474 475
-@71 (353)
+$@71 (353)
     on left: 477, on right: 478
 array_pair_list (354)
     on left: 480 481, on right: 328 329
@@ -1383,7 +1383,7 @@ encaps_list (356)
     on left: 490 491 492 493, on right: 380 412 413 490 491
 encaps_var (357)
     on left: 494 496 497 498 499 500, on right: 490 492 493
-@72 (358)
+$@72 (358)
     on left: 495, on right: 496
 encaps_var_offset (359)
     on left: 501 502 503, on right: 496
@@ -1391,13 +1391,13 @@ internal_functions_in_yacc (360)
     on left: 504 505 506 507 508 509 510, on right: 316
 isset_variables (361)
     on left: 511 513, on right: 504 513
-@73 (362)
+$@73 (362)
     on left: 512, on right: 513
 class_constant (363)
     on left: 514 515, on right: 407
 
 
-state 0
+State 0
 
     0 $accept: . start "end of file"
 
@@ -1407,34 +1407,34 @@ state 0
     top_statement_list  go to state 2
 
 
-state 1
+State 1
 
     0 $accept: start . "end of file"
 
     "end of file"  shift, and go to state 3
 
 
-state 2
+State 2
 
     1 start: top_statement_list .
-    3 top_statement_list: top_statement_list . @1 top_statement
+    3 top_statement_list: top_statement_list . $@1 top_statement
 
     "end of file"  reduce using rule 1 (start)
-    $default       reduce using rule 2 (@1)
+    $default       reduce using rule 2 ($@1)
 
-    @1  go to state 4
+    $@1  go to state 4
 
 
-state 3
+State 3
 
     0 $accept: start "end of file" .
 
     $default  accept
 
 
-state 4
+State 4
 
-    3 top_statement_list: top_statement_list @1 . top_statement
+    3 top_statement_list: top_statement_list $@1 . top_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -1550,7 +1550,7 @@ state 4
     class_constant                           go to state 115
 
 
-state 5
+State 5
 
   510 internal_functions_in_yacc: "require_once (T_REQUIRE_ONCE)" . expr
 
@@ -1631,7 +1631,7 @@ state 5
     class_constant                     go to state 115
 
 
-state 6
+State 6
 
   509 internal_functions_in_yacc: "require (T_REQUIRE)" . expr
 
@@ -1712,14 +1712,14 @@ state 6
     class_constant                     go to state 115
 
 
-state 7
+State 7
 
   508 internal_functions_in_yacc: "eval (T_EVAL)" . '(' expr ')'
 
     '('  shift, and go to state 122
 
 
-state 8
+State 8
 
   507 internal_functions_in_yacc: "include_once (T_INCLUDE_ONCE)" . expr
 
@@ -1800,7 +1800,7 @@ state 8
     class_constant                     go to state 115
 
 
-state 9
+State 9
 
   506 internal_functions_in_yacc: "include (T_INCLUDE)" . expr
 
@@ -1881,7 +1881,7 @@ state 9
     class_constant                     go to state 115
 
 
-state 10
+State 10
 
   331 expr_without_variable: "print (T_PRINT)" . expr
 
@@ -1962,7 +1962,7 @@ state 10
     class_constant                     go to state 115
 
 
-state 11
+State 11
 
   294 expr_without_variable: '+' . expr
 
@@ -2043,7 +2043,7 @@ state 11
     class_constant                     go to state 115
 
 
-state 12
+State 12
 
   295 expr_without_variable: '-' . expr
 
@@ -2124,7 +2124,7 @@ state 12
     class_constant                     go to state 115
 
 
-state 13
+State 13
 
   296 expr_without_variable: '!' . expr
 
@@ -2205,7 +2205,7 @@ state 13
     class_constant                     go to state 115
 
 
-state 14
+State 14
 
   297 expr_without_variable: '~' . expr
 
@@ -2286,16 +2286,16 @@ state 14
     class_constant                     go to state 115
 
 
-state 15
+State 15
 
-  326 expr_without_variable: '@' . @52 expr
+  326 expr_without_variable: '@' . $@52 expr
 
-    $default  reduce using rule 325 (@52)
+    $default  reduce using rule 325 ($@52)
 
-    @52  go to state 130
+    $@52  go to state 130
 
 
-state 16
+State 16
 
   323 expr_without_variable: "(unset) (T_UNSET_CAST)" . expr
 
@@ -2376,7 +2376,7 @@ state 16
     class_constant                     go to state 115
 
 
-state 17
+State 17
 
   322 expr_without_variable: "(bool) (T_BOOL_CAST)" . expr
 
@@ -2457,7 +2457,7 @@ state 17
     class_constant                     go to state 115
 
 
-state 18
+State 18
 
   321 expr_without_variable: "(object) (T_OBJECT_CAST)" . expr
 
@@ -2538,7 +2538,7 @@ state 18
     class_constant                     go to state 115
 
 
-state 19
+State 19
 
   320 expr_without_variable: "(array) (T_ARRAY_CAST)" . expr
 
@@ -2619,7 +2619,7 @@ state 19
     class_constant                     go to state 115
 
 
-state 20
+State 20
 
   319 expr_without_variable: "(string) (T_STRING_CAST)" . expr
 
@@ -2700,7 +2700,7 @@ state 20
     class_constant                     go to state 115
 
 
-state 21
+State 21
 
   318 expr_without_variable: "(double) (T_DOUBLE_CAST)" . expr
 
@@ -2781,7 +2781,7 @@ state 21
     class_constant                     go to state 115
 
 
-state 22
+State 22
 
   317 expr_without_variable: "(int) (T_INT_CAST)" . expr
 
@@ -2862,7 +2862,7 @@ state 22
     class_constant                     go to state 115
 
 
-state 23
+State 23
 
   273 expr_without_variable: "-- (T_DEC)" . rw_variable
 
@@ -2889,7 +2889,7 @@ state 23
     simple_indirect_reference          go to state 113
 
 
-state 24
+State 24
 
   271 expr_without_variable: "++ (T_INC)" . rw_variable
 
@@ -2916,7 +2916,7 @@ state 24
     simple_indirect_reference          go to state 113
 
 
-state 25
+State 25
 
   329 expr_without_variable: '[' . array_pair_list ']'
 
@@ -3002,7 +3002,7 @@ state 25
     class_constant                     go to state 115
 
 
-state 26
+State 26
 
   258 expr_without_variable: "clone (T_CLONE)" . expr
 
@@ -3083,9 +3083,9 @@ state 26
     class_constant                     go to state 115
 
 
-state 27
+State 27
 
-  251 new_expr: "new (T_NEW)" . class_name_reference @41 ctor_arguments
+  251 new_expr: "new (T_NEW)" . class_name_reference $@41 ctor_arguments
 
     "identifier (T_STRING)"    shift, and go to state 116
     "variable (T_VARIABLE)"    shift, and go to state 34
@@ -3106,7 +3106,7 @@ state 27
     simple_indirect_reference     go to state 161
 
 
-state 28
+State 28
 
   324 expr_without_variable: "exit (T_EXIT)" . exit_expr
 
@@ -3117,29 +3117,29 @@ state 28
     exit_expr  go to state 163
 
 
-state 29
+State 29
 
-   38 unticked_statement: "if (T_IF)" . '(' expr ')' @5 statement @6 elseif_list else_single
-   41                   | "if (T_IF)" . '(' expr ')' ':' @7 inner_statement_list @8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
+   38 unticked_statement: "if (T_IF)" . '(' expr ')' $@5 statement $@6 elseif_list else_single
+   41                   | "if (T_IF)" . '(' expr ')' ':' $@7 inner_statement_list $@8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
 
     '('  shift, and go to state 164
 
 
-state 30
+State 30
 
   383 common_scalar: "integer number (T_LNUMBER)" .
 
     $default  reduce using rule 383 (common_scalar)
 
 
-state 31
+State 31
 
   384 common_scalar: "floating-point number (T_DNUMBER)" .
 
     $default  reduce using rule 384 (common_scalar)
 
 
-state 32
+State 32
 
     5 namespace_name: "identifier (T_STRING)" .
    34 statement: "identifier (T_STRING)" . ':'
@@ -3149,35 +3149,35 @@ state 32
     $default  reduce using rule 5 (namespace_name)
 
 
-state 33
+State 33
 
   406 scalar: "variable name (T_STRING_VARNAME)" .
 
     $default  reduce using rule 406 (scalar)
 
 
-state 34
+State 34
 
   460 compound_variable: "variable (T_VARIABLE)" .
 
     $default  reduce using rule 460 (compound_variable)
 
 
-state 35
+State 35
 
    64 unticked_statement: T_INLINE_HTML .
 
     $default  reduce using rule 64 (unticked_statement)
 
 
-state 36
+State 36
 
   385 common_scalar: "quoted-string (T_CONSTANT_ENCAPSED_STRING)" .
 
     $default  reduce using rule 385 (common_scalar)
 
 
-state 37
+State 37
 
    63 unticked_statement: "echo (T_ECHO)" . echo_expr_list ';'
 
@@ -3259,54 +3259,54 @@ state 37
     class_constant                     go to state 115
 
 
-state 38
+State 38
 
-   47 unticked_statement: "do (T_DO)" . @11 statement "while (T_WHILE)" '(' @12 expr ')' ';'
+   47 unticked_statement: "do (T_DO)" . $@11 statement "while (T_WHILE)" '(' $@12 expr ')' ';'
 
-    $default  reduce using rule 45 (@11)
+    $default  reduce using rule 45 ($@11)
 
-    @11  go to state 168
+    $@11  go to state 168
 
 
-state 39
+State 39
 
-   44 unticked_statement: "while (T_WHILE)" . '(' @9 expr ')' @10 while_statement
+   44 unticked_statement: "while (T_WHILE)" . '(' $@9 expr ')' $@10 while_statement
 
     '('  shift, and go to state 169
 
 
-state 40
+State 40
 
-   51 unticked_statement: "for (T_FOR)" . '(' for_expr ';' @13 for_expr ';' @14 for_expr ')' @15 for_statement
+   51 unticked_statement: "for (T_FOR)" . '(' for_expr ';' $@13 for_expr ';' $@14 for_expr ')' $@15 for_statement
 
     '('  shift, and go to state 170
 
 
-state 41
+State 41
 
-   69 unticked_statement: "foreach (T_FOREACH)" . '(' variable "as (T_AS)" @17 foreach_variable foreach_optional_arg ')' @18 foreach_statement
-   72                   | "foreach (T_FOREACH)" . '(' expr_without_variable "as (T_AS)" @19 variable foreach_optional_arg ')' @20 foreach_statement
+   69 unticked_statement: "foreach (T_FOREACH)" . '(' variable "as (T_AS)" $@17 foreach_variable foreach_optional_arg ')' $@18 foreach_statement
+   72                   | "foreach (T_FOREACH)" . '(' expr_without_variable "as (T_AS)" $@19 variable foreach_optional_arg ')' $@20 foreach_statement
 
     '('  shift, and go to state 171
 
 
-state 42
+State 42
 
-   74 unticked_statement: "declare (T_DECLARE)" . @21 '(' declare_list ')' declare_statement
+   74 unticked_statement: "declare (T_DECLARE)" . $@21 '(' declare_list ')' declare_statement
 
-    $default  reduce using rule 73 (@21)
+    $default  reduce using rule 73 ($@21)
 
-    @21  go to state 172
+    $@21  go to state 172
 
 
-state 43
+State 43
 
-   53 unticked_statement: "switch (T_SWITCH)" . '(' expr ')' @16 switch_case_list
+   53 unticked_statement: "switch (T_SWITCH)" . '(' expr ')' $@16 switch_case_list
 
     '('  shift, and go to state 173
 
 
-state 44
+State 44
 
    54 unticked_statement: "break (T_BREAK)" . ';'
    55                   | "break (T_BREAK)" . expr ';'
@@ -3389,7 +3389,7 @@ state 44
     class_constant                     go to state 115
 
 
-state 45
+State 45
 
    56 unticked_statement: "continue (T_CONTINUE)" . ';'
    57                   | "continue (T_CONTINUE)" . expr ';'
@@ -3472,28 +3472,28 @@ state 45
     class_constant                     go to state 115
 
 
-state 46
+State 46
 
    83 unticked_statement: "goto (T_GOTO)" . "identifier (T_STRING)" ';'
 
     "identifier (T_STRING)"  shift, and go to state 178
 
 
-state 47
+State 47
 
   336 function: "function (T_FUNCTION)" .
 
     $default  reduce using rule 336 (function)
 
 
-state 48
+State 48
 
    25 constant_declaration: "const (T_CONST)" . "identifier (T_STRING)" '=' static_scalar
 
     "identifier (T_STRING)"  shift, and go to state 179
 
 
-state 49
+State 49
 
    58 unticked_statement: "return (T_RETURN)" . ';'
    59                   | "return (T_RETURN)" . expr_without_variable ';'
@@ -3577,16 +3577,16 @@ state 49
     class_constant                     go to state 115
 
 
-state 50
+State 50
 
-   81 unticked_statement: "try (T_TRY)" . @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" . $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
-    $default  reduce using rule 76 (@22)
+    $default  reduce using rule 76 ($@22)
 
-    @22  go to state 184
+    $@22  go to state 184
 
 
-state 51
+State 51
 
    82 unticked_statement: "throw (T_THROW)" . expr ';'
 
@@ -3667,7 +3667,7 @@ state 51
     class_constant                     go to state 115
 
 
-state 52
+State 52
 
    16 top_statement: "use (T_USE)" . use_declarations ';'
 
@@ -3679,7 +3679,7 @@ state 52
     use_declaration   go to state 189
 
 
-state 53
+State 53
 
    61 unticked_statement: "global (T_GLOBAL)" . global_var_list ';'
 
@@ -3690,21 +3690,21 @@ state 53
     global_var       go to state 193
 
 
-state 54
+State 54
 
   107 class_entry_type: "final (T_FINAL)" . "class (T_CLASS)"
 
     "class (T_CLASS)"  shift, and go to state 194
 
 
-state 55
+State 55
 
   105 class_entry_type: "abstract (T_ABSTRACT)" . "class (T_CLASS)"
 
     "class (T_CLASS)"  shift, and go to state 195
 
 
-state 56
+State 56
 
    62 unticked_statement: "static (T_STATIC)" . static_var_list ';'
   335 expr_without_variable: "static (T_STATIC)" . function is_reference '(' @54 parameter_list ')' lexical_vars '{' inner_statement_list '}'
@@ -3719,112 +3719,112 @@ state 56
     function         go to state 198
 
 
-state 57
+State 57
 
    66 unticked_statement: "unset (T_UNSET)" . '(' unset_variables ')' ';'
 
     '('  shift, and go to state 199
 
 
-state 58
+State 58
 
   504 internal_functions_in_yacc: "isset (T_ISSET)" . '(' isset_variables ')'
 
     '('  shift, and go to state 200
 
 
-state 59
+State 59
 
   505 internal_functions_in_yacc: "empty (T_EMPTY)" . '(' variable ')'
 
     '('  shift, and go to state 201
 
 
-state 60
+State 60
 
    10 top_statement: "__halt_compiler (T_HALT_COMPILER)" . '(' ')' ';'
 
     '('  shift, and go to state 202
 
 
-state 61
+State 61
 
   104 class_entry_type: "class (T_CLASS)" .
 
     $default  reduce using rule 104 (class_entry_type)
 
 
-state 62
+State 62
 
   106 class_entry_type: "trait (T_TRAIT)" .
 
     $default  reduce using rule 106 (class_entry_type)
 
 
-state 63
+State 63
 
   110 interface_entry: "interface (T_INTERFACE)" .
 
     $default  reduce using rule 110 (interface_entry)
 
 
-state 64
+State 64
 
-  253 expr_without_variable: "list (T_LIST)" . '(' @42 assignment_list ')' '=' expr
+  253 expr_without_variable: "list (T_LIST)" . '(' $@42 assignment_list ')' '=' expr
 
     '('  shift, and go to state 203
 
 
-state 65
+State 65
 
   328 expr_without_variable: "array (T_ARRAY)" . '(' array_pair_list ')'
 
     '('  shift, and go to state 204
 
 
-state 66
+State 66
 
   414 scalar: "__CLASS__ (T_CLASS_C)" .
 
     $default  reduce using rule 414 (scalar)
 
 
-state 67
+State 67
 
   389 common_scalar: "__TRAIT__ (T_TRAIT_C)" .
 
     $default  reduce using rule 389 (common_scalar)
 
 
-state 68
+State 68
 
   390 common_scalar: "__METHOD__ (T_METHOD_C)" .
 
     $default  reduce using rule 390 (common_scalar)
 
 
-state 69
+State 69
 
   391 common_scalar: "__FUNCTION__ (T_FUNC_C)" .
 
     $default  reduce using rule 391 (common_scalar)
 
 
-state 70
+State 70
 
   386 common_scalar: "__LINE__ (T_LINE)" .
 
     $default  reduce using rule 386 (common_scalar)
 
 
-state 71
+State 71
 
   387 common_scalar: "__FILE__ (T_FILE)" .
 
     $default  reduce using rule 387 (common_scalar)
 
 
-state 72
+State 72
 
   393 common_scalar: "heredoc start (T_START_HEREDOC)" . "quoted-string and whitespace (T_ENCAPSED_AND_WHITESPACE)" "heredoc end (T_END_HEREDOC)"
   394              | "heredoc start (T_START_HEREDOC)" . "heredoc end (T_END_HEREDOC)"
@@ -3840,12 +3840,12 @@ state 72
     encaps_var   go to state 211
 
 
-state 73
+State 73
 
    11 top_statement: "namespace (T_NAMESPACE)" . namespace_name ';'
-   13              | "namespace (T_NAMESPACE)" . namespace_name '{' @2 top_statement_list '}'
-   15              | "namespace (T_NAMESPACE)" . '{' @3 top_statement_list '}'
-  346 function_call: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name '(' @56 function_call_parameter_list ')'
+   13              | "namespace (T_NAMESPACE)" . namespace_name '{' $@2 top_statement_list '}'
+   15              | "namespace (T_NAMESPACE)" . '{' $@3 top_statement_list '}'
+  346 function_call: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name '(' $@56 function_call_parameter_list ')'
   361 class_name: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name
   409 scalar: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name
 
@@ -3856,23 +3856,23 @@ state 73
     namespace_name  go to state 214
 
 
-state 74
+State 74
 
   392 common_scalar: "__NAMESPACE__ (T_NS_C)" .
 
     $default  reduce using rule 392 (common_scalar)
 
 
-state 75
+State 75
 
   388 common_scalar: "__DIR__ (T_DIR)" .
 
     $default  reduce using rule 388 (common_scalar)
 
 
-state 76
+State 76
 
-  348 function_call: "\\ (T_NS_SEPARATOR)" . namespace_name '(' @57 function_call_parameter_list ')'
+  348 function_call: "\\ (T_NS_SEPARATOR)" . namespace_name '(' $@57 function_call_parameter_list ')'
   362 class_name: "\\ (T_NS_SEPARATOR)" . namespace_name
   410 scalar: "\\ (T_NS_SEPARATOR)" . namespace_name
 
@@ -3881,7 +3881,7 @@ state 76
     namespace_name  go to state 215
 
 
-state 77
+State 77
 
   307 expr_without_variable: '(' . expr ')'
   310                      | '(' . new_expr ')' @48 instance_call
@@ -3963,14 +3963,14 @@ state 77
     class_constant                     go to state 115
 
 
-state 78
+State 78
 
    75 unticked_statement: ';' .
 
     $default  reduce using rule 75 (unticked_statement)
 
 
-state 79
+State 79
 
    35 unticked_statement: '{' . inner_statement_list '}'
 
@@ -3979,7 +3979,7 @@ state 79
     inner_statement_list  go to state 218
 
 
-state 80
+State 80
 
   461 compound_variable: '$' . '{' expr '}'
   472 simple_indirect_reference: '$' .
@@ -3989,7 +3989,7 @@ state 80
     $default  reduce using rule 472 (simple_indirect_reference)
 
 
-state 81
+State 81
 
   330 expr_without_variable: '`' . backticks_expr '`'
 
@@ -4005,7 +4005,7 @@ state 81
     encaps_var      go to state 211
 
 
-state 82
+State 82
 
   412 scalar: '"' . encaps_list '"'
 
@@ -4018,10 +4018,10 @@ state 82
     encaps_var   go to state 211
 
 
-state 83
+State 83
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
-  344 function_call: namespace_name . '(' @55 function_call_parameter_list ')'
+  344 function_call: namespace_name . '(' $@55 function_call_parameter_list ')'
   360 class_name: namespace_name .
   408 scalar: namespace_name .
 
@@ -4032,14 +4032,14 @@ state 83
     $default                       reduce using rule 408 (scalar)
 
 
-state 84
+State 84
 
-    3 top_statement_list: top_statement_list @1 top_statement .
+    3 top_statement_list: top_statement_list $@1 top_statement .
 
     $default  reduce using rule 3 (top_statement_list)
 
 
-state 85
+State 85
 
    17 top_statement: constant_declaration . ';'
    24 constant_declaration: constant_declaration . ',' "identifier (T_STRING)" '=' static_scalar
@@ -4048,79 +4048,79 @@ state 85
     ';'  shift, and go to state 228
 
 
-state 86
+State 86
 
     7 top_statement: statement .
 
     $default  reduce using rule 7 (top_statement)
 
 
-state 87
+State 87
 
    33 statement: unticked_statement .
 
     $default  reduce using rule 33 (statement)
 
 
-state 88
+State 88
 
     8 top_statement: function_declaration_statement .
 
     $default  reduce using rule 8 (top_statement)
 
 
-state 89
+State 89
 
     9 top_statement: class_declaration_statement .
 
     $default  reduce using rule 9 (top_statement)
 
 
-state 90
+State 90
 
    94 function_declaration_statement: unticked_function_declaration_statement .
 
     $default  reduce using rule 94 (function_declaration_statement)
 
 
-state 91
+State 91
 
    95 class_declaration_statement: unticked_class_declaration_statement .
 
     $default  reduce using rule 95 (class_declaration_statement)
 
 
-state 92
+State 92
 
-  101 unticked_class_declaration_statement: class_entry_type . "identifier (T_STRING)" extends_from @30 implements_list '{' class_statement_list '}'
+  101 unticked_class_declaration_statement: class_entry_type . "identifier (T_STRING)" extends_from $@30 implements_list '{' class_statement_list '}'
 
     "identifier (T_STRING)"  shift, and go to state 229
 
 
-state 93
+State 93
 
-  103 unticked_class_declaration_statement: interface_entry . "identifier (T_STRING)" @31 interface_extends_list '{' class_statement_list '}'
+  103 unticked_class_declaration_statement: interface_entry . "identifier (T_STRING)" $@31 interface_extends_list '{' class_statement_list '}'
 
     "identifier (T_STRING)"  shift, and go to state 230
 
 
-state 94
+State 94
 
   308 expr_without_variable: new_expr .
 
     $default  reduce using rule 308 (expr_without_variable)
 
 
-state 95
+State 95
 
   424 expr: expr_without_variable .
 
     $default  reduce using rule 424 (expr)
 
 
-state 96
+State 96
 
-   99 unticked_function_declaration_statement: function . is_reference "identifier (T_STRING)" @29 '(' parameter_list ')' '{' inner_statement_list '}'
+   99 unticked_function_declaration_statement: function . is_reference "identifier (T_STRING)" $@29 '(' parameter_list ')' '{' inner_statement_list '}'
   333 expr_without_variable: function . is_reference '(' @53 parameter_list ')' lexical_vars '{' inner_statement_list '}'
 
     '&'  shift, and go to state 231
@@ -4130,48 +4130,48 @@ state 96
     is_reference  go to state 232
 
 
-state 97
+State 97
 
-  450 array_function_dereference: function_call . @69 '[' dim_offset ']'
+  450 array_function_dereference: function_call . $@69 '[' dim_offset ']'
   453 base_variable_with_function_calls: function_call .
 
-    '['       reduce using rule 449 (@69)
+    '['       reduce using rule 449 ($@69)
     $default  reduce using rule 453 (base_variable_with_function_calls)
 
-    @69  go to state 233
+    $@69  go to state 233
 
 
-state 98
+State 98
 
-  350 function_call: class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @58 function_call_parameter_list ')'
-  352              | class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @59 function_call_parameter_list ')'
+  350 function_call: class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@58 function_call_parameter_list ')'
+  352              | class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@59 function_call_parameter_list ')'
   445 static_member: class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects
   514 class_constant: class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" "identifier (T_STRING)"
 
     ":: (T_PAAMAYIM_NEKUDOTAYIM)"  shift, and go to state 234
 
 
-state 99
+State 99
 
   411 scalar: common_scalar .
 
     $default  reduce using rule 411 (scalar)
 
 
-state 100
+State 100
 
   327 expr_without_variable: scalar .
 
     $default  reduce using rule 327 (expr_without_variable)
 
 
-state 101
+State 101
 
    65 unticked_statement: expr . ';'
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -4193,8 +4193,8 @@ state 101
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -4225,14 +4225,14 @@ state 101
     ';'                           shift, and go to state 261
 
 
-state 102
+State 102
 
   423 expr: r_variable .
 
     $default  reduce using rule 423 (expr)
 
 
-state 103
+State 103
 
   270 expr_without_variable: rw_variable . "++ (T_INC)"
   272                      | rw_variable . "-- (T_DEC)"
@@ -4241,11 +4241,11 @@ state 103
     "++ (T_INC)"  shift, and go to state 263
 
 
-state 104
+State 104
 
   254 expr_without_variable: variable . '=' expr
   255                      | variable . '=' '&' variable
-  257                      | variable . '=' '&' "new (T_NEW)" class_name_reference @43 ctor_arguments
+  257                      | variable . '=' '&' "new (T_NEW)" class_name_reference $@43 ctor_arguments
   259                      | variable . "+= (T_PLUS_EQUAL)" expr
   260                      | variable . "-= (T_MINUS_EQUAL)" expr
   261                      | variable . "*= (T_MUL_EQUAL)" expr
@@ -4278,31 +4278,31 @@ state 104
     $default      reduce using rule 425 (r_variable)
 
 
-state 105
+State 105
 
-  358 function_call: variable_without_objects . '(' @62 function_call_parameter_list ')'
+  358 function_call: variable_without_objects . '(' $@62 function_call_parameter_list ')'
 
     '('  shift, and go to state 276
 
 
-state 106
+State 106
 
   456 base_variable: static_member .
 
     $default  reduce using rule 456 (base_variable)
 
 
-state 107
+State 107
 
-  354 function_call: variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @60 function_call_parameter_list ')'
-  356              | variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @61 function_call_parameter_list ')'
+  354 function_call: variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@60 function_call_parameter_list ')'
+  356              | variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@61 function_call_parameter_list ')'
   446 static_member: variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects
   515 class_constant: variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" "identifier (T_STRING)"
 
     ":: (T_PAAMAYIM_NEKUDOTAYIM)"  shift, and go to state 277
 
 
-state 108
+State 108
 
   448 array_function_dereference: array_function_dereference . '[' dim_offset ']'
   452 base_variable_with_function_calls: array_function_dereference .
@@ -4312,9 +4312,9 @@ state 108
     $default  reduce using rule 452 (base_variable_with_function_calls)
 
 
-state 109
+State 109
 
-  430 variable: base_variable_with_function_calls . "-> (T_OBJECT_OPERATOR)" @65 object_property @66 method_or_not variable_properties
+  430 variable: base_variable_with_function_calls . "-> (T_OBJECT_OPERATOR)" $@65 object_property $@66 method_or_not variable_properties
   431         | base_variable_with_function_calls .
 
     "-> (T_OBJECT_OPERATOR)"  shift, and go to state 279
@@ -4322,14 +4322,14 @@ state 109
     $default  reduce using rule 431 (variable)
 
 
-state 110
+State 110
 
   451 base_variable_with_function_calls: base_variable .
 
     $default  reduce using rule 451 (base_variable_with_function_calls)
 
 
-state 111
+State 111
 
   443 variable_without_objects: reference_variable .
   447 variable_class_name: reference_variable .
@@ -4345,14 +4345,14 @@ state 111
     $default                       reduce using rule 454 (base_variable)
 
 
-state 112
+State 112
 
   459 reference_variable: compound_variable .
 
     $default  reduce using rule 459 (reference_variable)
 
 
-state 113
+State 113
 
   444 variable_without_objects: simple_indirect_reference . reference_variable
   455 base_variable: simple_indirect_reference . reference_variable
@@ -4365,28 +4365,28 @@ state 113
     compound_variable   go to state 112
 
 
-state 114
+State 114
 
   316 expr_without_variable: internal_functions_in_yacc .
 
     $default  reduce using rule 316 (expr_without_variable)
 
 
-state 115
+State 115
 
   407 scalar: class_constant .
 
     $default  reduce using rule 407 (scalar)
 
 
-state 116
+State 116
 
     5 namespace_name: "identifier (T_STRING)" .
 
     $default  reduce using rule 5 (namespace_name)
 
 
-state 117
+State 117
 
   335 expr_without_variable: "static (T_STATIC)" . function is_reference '(' @54 parameter_list ')' lexical_vars '{' inner_statement_list '}'
   359 class_name: "static (T_STATIC)" .
@@ -4398,16 +4398,16 @@ state 117
     function  go to state 198
 
 
-state 118
+State 118
 
-  346 function_call: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name '(' @56 function_call_parameter_list ')'
+  346 function_call: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name '(' $@56 function_call_parameter_list ')'
   361 class_name: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name
   409 scalar: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name
 
     "\\ (T_NS_SEPARATOR)"  shift, and go to state 212
 
 
-state 119
+State 119
 
   333 expr_without_variable: function . is_reference '(' @53 parameter_list ')' lexical_vars '{' inner_statement_list '}'
 
@@ -4418,12 +4418,12 @@ state 119
     is_reference  go to state 284
 
 
-state 120
+State 120
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -4445,8 +4445,8 @@ state 120
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   510 internal_functions_in_yacc: "require_once (T_REQUIRE_ONCE)" expr .
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -4479,12 +4479,12 @@ state 120
     $default  reduce using rule 510 (internal_functions_in_yacc)
 
 
-state 121
+State 121
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -4506,8 +4506,8 @@ state 121
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   509 internal_functions_in_yacc: "require (T_REQUIRE)" expr .
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -4540,7 +4540,7 @@ state 121
     $default  reduce using rule 509 (internal_functions_in_yacc)
 
 
-state 122
+State 122
 
   508 internal_functions_in_yacc: "eval (T_EVAL)" '(' . expr ')'
 
@@ -4621,12 +4621,12 @@ state 122
     class_constant                     go to state 115
 
 
-state 123
+State 123
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -4648,8 +4648,8 @@ state 123
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   507 internal_functions_in_yacc: "include_once (T_INCLUDE_ONCE)" expr .
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -4682,12 +4682,12 @@ state 123
     $default  reduce using rule 507 (internal_functions_in_yacc)
 
 
-state 124
+State 124
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -4709,8 +4709,8 @@ state 124
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   506 internal_functions_in_yacc: "include (T_INCLUDE)" expr .
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -4743,12 +4743,12 @@ state 124
     $default  reduce using rule 506 (internal_functions_in_yacc)
 
 
-state 125
+State 125
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -4770,8 +4770,8 @@ state 125
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   331                      | "print (T_PRINT)" expr .
 
     '?'                           shift, and go to state 238
@@ -4801,12 +4801,12 @@ state 125
     $default  reduce using rule 331 (expr_without_variable)
 
 
-state 126
+State 126
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -4829,18 +4829,18 @@ state 126
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     $default  reduce using rule 294 (expr_without_variable)
 
 
-state 127
+State 127
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -4863,18 +4863,18 @@ state 127
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     $default  reduce using rule 295 (expr_without_variable)
 
 
-state 128
+State 128
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -4897,20 +4897,20 @@ state 128
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "instanceof (T_INSTANCEOF)"  shift, and go to state 260
 
     $default  reduce using rule 296 (expr_without_variable)
 
 
-state 129
+State 129
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -4933,15 +4933,15 @@ state 129
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     $default  reduce using rule 297 (expr_without_variable)
 
 
-state 130
+State 130
 
-  326 expr_without_variable: '@' @52 . expr
+  326 expr_without_variable: '@' $@52 . expr
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -5020,12 +5020,12 @@ state 130
     class_constant                     go to state 115
 
 
-state 131
+State 131
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -5047,19 +5047,19 @@ state 131
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   323                      | "(unset) (T_UNSET_CAST)" expr .
 
     $default  reduce using rule 323 (expr_without_variable)
 
 
-state 132
+State 132
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -5081,19 +5081,19 @@ state 132
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   322                      | "(bool) (T_BOOL_CAST)" expr .
 
     $default  reduce using rule 322 (expr_without_variable)
 
 
-state 133
+State 133
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -5115,19 +5115,19 @@ state 133
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   321                      | "(object) (T_OBJECT_CAST)" expr .
 
     $default  reduce using rule 321 (expr_without_variable)
 
 
-state 134
+State 134
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -5149,19 +5149,19 @@ state 134
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   320                      | "(array) (T_ARRAY_CAST)" expr .
 
     $default  reduce using rule 320 (expr_without_variable)
 
 
-state 135
+State 135
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -5183,19 +5183,19 @@ state 135
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   319                      | "(string) (T_STRING_CAST)" expr .
 
     $default  reduce using rule 319 (expr_without_variable)
 
 
-state 136
+State 136
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -5217,19 +5217,19 @@ state 136
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   318                      | "(double) (T_DOUBLE_CAST)" expr .
 
     $default  reduce using rule 318 (expr_without_variable)
 
 
-state 137
+State 137
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -5251,31 +5251,31 @@ state 137
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   317                      | "(int) (T_INT_CAST)" expr .
 
     $default  reduce using rule 317 (expr_without_variable)
 
 
-state 138
+State 138
 
   359 class_name: "static (T_STATIC)" .
 
     $default  reduce using rule 359 (class_name)
 
 
-state 139
+State 139
 
-  346 function_call: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name '(' @56 function_call_parameter_list ')'
+  346 function_call: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name '(' $@56 function_call_parameter_list ')'
   361 class_name: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name
 
     "\\ (T_NS_SEPARATOR)"  shift, and go to state 287
 
 
-state 140
+State 140
 
-  348 function_call: "\\ (T_NS_SEPARATOR)" . namespace_name '(' @57 function_call_parameter_list ')'
+  348 function_call: "\\ (T_NS_SEPARATOR)" . namespace_name '(' $@57 function_call_parameter_list ')'
   362 class_name: "\\ (T_NS_SEPARATOR)" . namespace_name
 
     "identifier (T_STRING)"  shift, and go to state 116
@@ -5283,10 +5283,10 @@ state 140
     namespace_name  go to state 288
 
 
-state 141
+State 141
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
-  344 function_call: namespace_name . '(' @55 function_call_parameter_list ')'
+  344 function_call: namespace_name . '(' $@55 function_call_parameter_list ')'
   360 class_name: namespace_name .
 
     "\\ (T_NS_SEPARATOR)"  shift, and go to state 225
@@ -5295,46 +5295,46 @@ state 141
     $default  reduce using rule 360 (class_name)
 
 
-state 142
+State 142
 
-  350 function_call: class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @58 function_call_parameter_list ')'
-  352              | class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @59 function_call_parameter_list ')'
+  350 function_call: class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@58 function_call_parameter_list ')'
+  352              | class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@59 function_call_parameter_list ')'
   445 static_member: class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects
 
     ":: (T_PAAMAYIM_NEKUDOTAYIM)"  shift, and go to state 289
 
 
-state 143
+State 143
 
   273 expr_without_variable: "-- (T_DEC)" rw_variable .
 
     $default  reduce using rule 273 (expr_without_variable)
 
 
-state 144
+State 144
 
   427 rw_variable: variable .
 
     $default  reduce using rule 427 (rw_variable)
 
 
-state 145
+State 145
 
-  354 function_call: variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @60 function_call_parameter_list ')'
-  356              | variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @61 function_call_parameter_list ')'
+  354 function_call: variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@60 function_call_parameter_list ')'
+  356              | variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@61 function_call_parameter_list ')'
   446 static_member: variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects
 
     ":: (T_PAAMAYIM_NEKUDOTAYIM)"  shift, and go to state 290
 
 
-state 146
+State 146
 
   271 expr_without_variable: "++ (T_INC)" rw_variable .
 
     $default  reduce using rule 271 (expr_without_variable)
 
 
-state 147
+State 147
 
   489 non_empty_array_pair_list: '&' . w_variable
 
@@ -5361,12 +5361,12 @@ state 147
     simple_indirect_reference          go to state 113
 
 
-state 148
+State 148
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -5388,8 +5388,8 @@ state 148
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   484 non_empty_array_pair_list: expr . "=> (T_DOUBLE_ARROW)" expr
   485                          | expr .
   488                          | expr . "=> (T_DOUBLE_ARROW)" '&' w_variable
@@ -5425,14 +5425,14 @@ state 148
     $default  reduce using rule 485 (non_empty_array_pair_list)
 
 
-state 149
+State 149
 
   329 expr_without_variable: '[' array_pair_list . ']'
 
     ']'  shift, and go to state 294
 
 
-state 150
+State 150
 
   481 array_pair_list: non_empty_array_pair_list . possible_comma
   482 non_empty_array_pair_list: non_empty_array_pair_list . ',' expr "=> (T_DOUBLE_ARROW)" expr
@@ -5447,13 +5447,13 @@ state 150
     possible_comma  go to state 296
 
 
-state 151
+State 151
 
   258 expr_without_variable: "clone (T_CLONE)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -5475,20 +5475,20 @@ state 151
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     $default  reduce using rule 258 (expr_without_variable)
 
 
-state 152
+State 152
 
   361 class_name: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name
 
     "\\ (T_NS_SEPARATOR)"  shift, and go to state 297
 
 
-state 153
+State 153
 
   362 class_name: "\\ (T_NS_SEPARATOR)" . namespace_name
 
@@ -5497,7 +5497,7 @@ state 153
     namespace_name  go to state 298
 
 
-state 154
+State 154
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
   360 class_name: namespace_name .
@@ -5507,7 +5507,7 @@ state 154
     $default  reduce using rule 360 (class_name)
 
 
-state 155
+State 155
 
   366 class_name_reference: class_name .
   445 static_member: class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects
@@ -5517,32 +5517,32 @@ state 155
     $default  reduce using rule 366 (class_name_reference)
 
 
-state 156
+State 156
 
-  251 new_expr: "new (T_NEW)" class_name_reference . @41 ctor_arguments
+  251 new_expr: "new (T_NEW)" class_name_reference . $@41 ctor_arguments
 
-    $default  reduce using rule 250 (@41)
+    $default  reduce using rule 250 ($@41)
 
-    @41  go to state 300
+    $@41  go to state 300
 
 
-state 157
+State 157
 
   367 class_name_reference: dynamic_class_name_reference .
 
     $default  reduce using rule 367 (class_name_reference)
 
 
-state 158
+State 158
 
   446 static_member: variable_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects
 
     ":: (T_PAAMAYIM_NEKUDOTAYIM)"  shift, and go to state 301
 
 
-state 159
+State 159
 
-  370 dynamic_class_name_reference: base_variable . "-> (T_OBJECT_OPERATOR)" @63 object_property @64 dynamic_class_name_variable_properties
+  370 dynamic_class_name_reference: base_variable . "-> (T_OBJECT_OPERATOR)" $@63 object_property $@64 dynamic_class_name_variable_properties
   371                             | base_variable .
 
     "-> (T_OBJECT_OPERATOR)"  shift, and go to state 302
@@ -5550,7 +5550,7 @@ state 159
     $default  reduce using rule 371 (dynamic_class_name_reference)
 
 
-state 160
+State 160
 
   447 variable_class_name: reference_variable .
   454 base_variable: reference_variable .
@@ -5564,7 +5564,7 @@ state 160
     $default                       reduce using rule 454 (base_variable)
 
 
-state 161
+State 161
 
   455 base_variable: simple_indirect_reference . reference_variable
   473 simple_indirect_reference: simple_indirect_reference . '$'
@@ -5576,7 +5576,7 @@ state 161
     compound_variable   go to state 112
 
 
-state 162
+State 162
 
   376 exit_expr: '(' . ')'
   377          | '(' . expr ')'
@@ -5659,17 +5659,17 @@ state 162
     class_constant                     go to state 115
 
 
-state 163
+State 163
 
   324 expr_without_variable: "exit (T_EXIT)" exit_expr .
 
     $default  reduce using rule 324 (expr_without_variable)
 
 
-state 164
+State 164
 
-   38 unticked_statement: "if (T_IF)" '(' . expr ')' @5 statement @6 elseif_list else_single
-   41                   | "if (T_IF)" '(' . expr ')' ':' @7 inner_statement_list @8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
+   38 unticked_statement: "if (T_IF)" '(' . expr ')' $@5 statement $@6 elseif_list else_single
+   41                   | "if (T_IF)" '(' . expr ')' ':' $@7 inner_statement_list $@8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -5748,14 +5748,14 @@ state 164
     class_constant                     go to state 115
 
 
-state 165
+State 165
 
    34 statement: "identifier (T_STRING)" ':' .
 
     $default  reduce using rule 34 (statement)
 
 
-state 166
+State 166
 
    63 unticked_statement: "echo (T_ECHO)" echo_expr_list . ';'
   232 echo_expr_list: echo_expr_list . ',' expr
@@ -5764,13 +5764,13 @@ state 166
     ';'  shift, and go to state 308
 
 
-state 167
+State 167
 
   233 echo_expr_list: expr .
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -5792,8 +5792,8 @@ state 167
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -5825,9 +5825,9 @@ state 167
     $default  reduce using rule 233 (echo_expr_list)
 
 
-state 168
+State 168
 
-   47 unticked_statement: "do (T_DO)" @11 . statement "while (T_WHILE)" '(' @12 expr ')' ';'
+   47 unticked_statement: "do (T_DO)" $@11 . statement "while (T_WHILE)" '(' $@12 expr ')' ';'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -5927,18 +5927,18 @@ state 168
     class_constant                     go to state 115
 
 
-state 169
+State 169
 
-   44 unticked_statement: "while (T_WHILE)" '(' . @9 expr ')' @10 while_statement
+   44 unticked_statement: "while (T_WHILE)" '(' . $@9 expr ')' $@10 while_statement
 
-    $default  reduce using rule 42 (@9)
+    $default  reduce using rule 42 ($@9)
 
-    @9  go to state 310
+    $@9  go to state 310
 
 
-state 170
+State 170
 
-   51 unticked_statement: "for (T_FOR)" '(' . for_expr ';' @13 for_expr ';' @14 for_expr ')' @15 for_statement
+   51 unticked_statement: "for (T_FOR)" '(' . for_expr ';' $@13 for_expr ';' $@14 for_expr ')' $@15 for_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -6021,10 +6021,10 @@ state 170
     class_constant                     go to state 115
 
 
-state 171
+State 171
 
-   69 unticked_statement: "foreach (T_FOREACH)" '(' . variable "as (T_AS)" @17 foreach_variable foreach_optional_arg ')' @18 foreach_statement
-   72                   | "foreach (T_FOREACH)" '(' . expr_without_variable "as (T_AS)" @19 variable foreach_optional_arg ')' @20 foreach_statement
+   69 unticked_statement: "foreach (T_FOREACH)" '(' . variable "as (T_AS)" $@17 foreach_variable foreach_optional_arg ')' $@18 foreach_statement
+   72                   | "foreach (T_FOREACH)" '(' . expr_without_variable "as (T_AS)" $@19 variable foreach_optional_arg ')' $@20 foreach_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -6103,16 +6103,16 @@ state 171
     class_constant                     go to state 115
 
 
-state 172
+State 172
 
-   74 unticked_statement: "declare (T_DECLARE)" @21 . '(' declare_list ')' declare_statement
+   74 unticked_statement: "declare (T_DECLARE)" $@21 . '(' declare_list ')' declare_statement
 
     '('  shift, and go to state 316
 
 
-state 173
+State 173
 
-   53 unticked_statement: "switch (T_SWITCH)" '(' . expr ')' @16 switch_case_list
+   53 unticked_statement: "switch (T_SWITCH)" '(' . expr ')' $@16 switch_case_list
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -6191,20 +6191,20 @@ state 173
     class_constant                     go to state 115
 
 
-state 174
+State 174
 
    54 unticked_statement: "break (T_BREAK)" ';' .
 
     $default  reduce using rule 54 (unticked_statement)
 
 
-state 175
+State 175
 
    55 unticked_statement: "break (T_BREAK)" expr . ';'
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -6226,8 +6226,8 @@ state 175
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -6258,20 +6258,20 @@ state 175
     ';'                           shift, and go to state 318
 
 
-state 176
+State 176
 
    56 unticked_statement: "continue (T_CONTINUE)" ';' .
 
     $default  reduce using rule 56 (unticked_statement)
 
 
-state 177
+State 177
 
    57 unticked_statement: "continue (T_CONTINUE)" expr . ';'
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -6293,8 +6293,8 @@ state 177
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -6325,28 +6325,28 @@ state 177
     ';'                           shift, and go to state 319
 
 
-state 178
+State 178
 
    83 unticked_statement: "goto (T_GOTO)" "identifier (T_STRING)" . ';'
 
     ';'  shift, and go to state 320
 
 
-state 179
+State 179
 
    25 constant_declaration: "const (T_CONST)" "identifier (T_STRING)" . '=' static_scalar
 
     '='  shift, and go to state 321
 
 
-state 180
+State 180
 
    58 unticked_statement: "return (T_RETURN)" ';' .
 
     $default  reduce using rule 58 (unticked_statement)
 
 
-state 181
+State 181
 
    59 unticked_statement: "return (T_RETURN)" expr_without_variable . ';'
   424 expr: expr_without_variable .
@@ -6356,12 +6356,12 @@ state 181
     $default  reduce using rule 424 (expr)
 
 
-state 182
+State 182
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -6383,8 +6383,8 @@ state 182
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -6414,12 +6414,12 @@ state 182
     "instanceof (T_INSTANCEOF)"   shift, and go to state 260
 
 
-state 183
+State 183
 
    60 unticked_statement: "return (T_RETURN)" variable . ';'
   254 expr_without_variable: variable . '=' expr
   255                      | variable . '=' '&' variable
-  257                      | variable . '=' '&' "new (T_NEW)" class_name_reference @43 ctor_arguments
+  257                      | variable . '=' '&' "new (T_NEW)" class_name_reference $@43 ctor_arguments
   259                      | variable . "+= (T_PLUS_EQUAL)" expr
   260                      | variable . "-= (T_MINUS_EQUAL)" expr
   261                      | variable . "*= (T_MUL_EQUAL)" expr
@@ -6453,20 +6453,20 @@ state 183
     $default      reduce using rule 425 (r_variable)
 
 
-state 184
+State 184
 
-   81 unticked_statement: "try (T_TRY)" @22 . '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 . '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
     '{'  shift, and go to state 324
 
 
-state 185
+State 185
 
    82 unticked_statement: "throw (T_THROW)" expr . ';'
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -6488,8 +6488,8 @@ state 185
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -6520,7 +6520,7 @@ state 185
     ';'                           shift, and go to state 325
 
 
-state 186
+State 186
 
    22 use_declaration: "\\ (T_NS_SEPARATOR)" . namespace_name
    23                | "\\ (T_NS_SEPARATOR)" . namespace_name "as (T_AS)" "identifier (T_STRING)"
@@ -6530,7 +6530,7 @@ state 186
     namespace_name  go to state 326
 
 
-state 187
+State 187
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
    20 use_declaration: namespace_name .
@@ -6542,7 +6542,7 @@ state 187
     $default  reduce using rule 20 (use_declaration)
 
 
-state 188
+State 188
 
    16 top_statement: "use (T_USE)" use_declarations . ';'
    18 use_declarations: use_declarations . ',' use_declaration
@@ -6551,21 +6551,21 @@ state 188
     ';'  shift, and go to state 329
 
 
-state 189
+State 189
 
    19 use_declarations: use_declaration .
 
     $default  reduce using rule 19 (use_declarations)
 
 
-state 190
+State 190
 
   176 global_var: "variable (T_VARIABLE)" .
 
     $default  reduce using rule 176 (global_var)
 
 
-state 191
+State 191
 
   177 global_var: '$' . r_variable
   178           | '$' . '{' expr '}'
@@ -6594,7 +6594,7 @@ state 191
     simple_indirect_reference          go to state 113
 
 
-state 192
+State 192
 
    61 unticked_statement: "global (T_GLOBAL)" global_var_list . ';'
   174 global_var_list: global_var_list . ',' global_var
@@ -6603,28 +6603,28 @@ state 192
     ';'  shift, and go to state 334
 
 
-state 193
+State 193
 
   175 global_var_list: global_var .
 
     $default  reduce using rule 175 (global_var_list)
 
 
-state 194
+State 194
 
   107 class_entry_type: "final (T_FINAL)" "class (T_CLASS)" .
 
     $default  reduce using rule 107 (class_entry_type)
 
 
-state 195
+State 195
 
   105 class_entry_type: "abstract (T_ABSTRACT)" "class (T_CLASS)" .
 
     $default  reduce using rule 105 (class_entry_type)
 
 
-state 196
+State 196
 
   181 static_var_list: "variable (T_VARIABLE)" .
   182                | "variable (T_VARIABLE)" . '=' static_scalar
@@ -6634,7 +6634,7 @@ state 196
     $default  reduce using rule 181 (static_var_list)
 
 
-state 197
+State 197
 
    62 unticked_statement: "static (T_STATIC)" static_var_list . ';'
   179 static_var_list: static_var_list . ',' "variable (T_VARIABLE)"
@@ -6644,7 +6644,7 @@ state 197
     ';'  shift, and go to state 337
 
 
-state 198
+State 198
 
   335 expr_without_variable: "static (T_STATIC)" function . is_reference '(' @54 parameter_list ')' lexical_vars '{' inner_statement_list '}'
 
@@ -6655,7 +6655,7 @@ state 198
     is_reference  go to state 338
 
 
-state 199
+State 199
 
    66 unticked_statement: "unset (T_UNSET)" '(' . unset_variables ')' ';'
 
@@ -6683,7 +6683,7 @@ state 199
     simple_indirect_reference          go to state 113
 
 
-state 200
+State 200
 
   504 internal_functions_in_yacc: "isset (T_ISSET)" '(' . isset_variables ')'
 
@@ -6710,7 +6710,7 @@ state 200
     isset_variables                    go to state 343
 
 
-state 201
+State 201
 
   505 internal_functions_in_yacc: "empty (T_EMPTY)" '(' . variable ')'
 
@@ -6736,23 +6736,23 @@ state 201
     simple_indirect_reference          go to state 113
 
 
-state 202
+State 202
 
    10 top_statement: "__halt_compiler (T_HALT_COMPILER)" '(' . ')' ';'
 
     ')'  shift, and go to state 345
 
 
-state 203
+State 203
 
-  253 expr_without_variable: "list (T_LIST)" '(' . @42 assignment_list ')' '=' expr
+  253 expr_without_variable: "list (T_LIST)" '(' . $@42 assignment_list ')' '=' expr
 
-    $default  reduce using rule 252 (@42)
+    $default  reduce using rule 252 ($@42)
 
-    @42  go to state 346
+    $@42  go to state 346
 
 
-state 204
+State 204
 
   328 expr_without_variable: "array (T_ARRAY)" '(' . array_pair_list ')'
 
@@ -6838,10 +6838,10 @@ state 204
     class_constant                     go to state 115
 
 
-state 205
+State 205
 
   494 encaps_var: "variable (T_VARIABLE)" .
-  496           | "variable (T_VARIABLE)" . '[' @72 encaps_var_offset ']'
+  496           | "variable (T_VARIABLE)" . '[' $@72 encaps_var_offset ']'
   497           | "variable (T_VARIABLE)" . "-> (T_OBJECT_OPERATOR)" "identifier (T_STRING)"
 
     '['                       shift, and go to state 348
@@ -6850,7 +6850,7 @@ state 205
     $default  reduce using rule 494 (encaps_var)
 
 
-state 206
+State 206
 
   393 common_scalar: "heredoc start (T_START_HEREDOC)" "quoted-string and whitespace (T_ENCAPSED_AND_WHITESPACE)" . "heredoc end (T_END_HEREDOC)"
   493 encaps_list: "quoted-string and whitespace (T_ENCAPSED_AND_WHITESPACE)" . encaps_var
@@ -6863,14 +6863,14 @@ state 206
     encaps_var  go to state 351
 
 
-state 207
+State 207
 
   394 common_scalar: "heredoc start (T_START_HEREDOC)" "heredoc end (T_END_HEREDOC)" .
 
     $default  reduce using rule 394 (common_scalar)
 
 
-state 208
+State 208
 
   498 encaps_var: "${ (T_DOLLAR_OPEN_CURLY_BRACES)" . expr '}'
   499           | "${ (T_DOLLAR_OPEN_CURLY_BRACES)" . "variable name (T_STRING_VARNAME)" '[' expr ']' '}'
@@ -6952,7 +6952,7 @@ state 208
     class_constant                     go to state 115
 
 
-state 209
+State 209
 
   500 encaps_var: "{$ (T_CURLY_OPEN)" . variable '}'
 
@@ -6978,7 +6978,7 @@ state 209
     simple_indirect_reference          go to state 113
 
 
-state 210
+State 210
 
   413 scalar: "heredoc start (T_START_HEREDOC)" encaps_list . "heredoc end (T_END_HEREDOC)"
   490 encaps_list: encaps_list . encaps_var
@@ -6993,16 +6993,16 @@ state 210
     encaps_var  go to state 357
 
 
-state 211
+State 211
 
   492 encaps_list: encaps_var .
 
     $default  reduce using rule 492 (encaps_list)
 
 
-state 212
+State 212
 
-  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" . namespace_name '(' @56 function_call_parameter_list ')'
+  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" . namespace_name '(' $@56 function_call_parameter_list ')'
   361 class_name: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" . namespace_name
   409 scalar: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" . namespace_name
 
@@ -7011,30 +7011,30 @@ state 212
     namespace_name  go to state 358
 
 
-state 213
+State 213
 
-   15 top_statement: "namespace (T_NAMESPACE)" '{' . @3 top_statement_list '}'
+   15 top_statement: "namespace (T_NAMESPACE)" '{' . $@3 top_statement_list '}'
 
-    $default  reduce using rule 14 (@3)
+    $default  reduce using rule 14 ($@3)
 
-    @3  go to state 359
+    $@3  go to state 359
 
 
-state 214
+State 214
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
    11 top_statement: "namespace (T_NAMESPACE)" namespace_name . ';'
-   13              | "namespace (T_NAMESPACE)" namespace_name . '{' @2 top_statement_list '}'
+   13              | "namespace (T_NAMESPACE)" namespace_name . '{' $@2 top_statement_list '}'
 
     "\\ (T_NS_SEPARATOR)"  shift, and go to state 225
     ';'                    shift, and go to state 360
     '{'                    shift, and go to state 361
 
 
-state 215
+State 215
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
-  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name . '(' @57 function_call_parameter_list ')'
+  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name . '(' $@57 function_call_parameter_list ')'
   362 class_name: "\\ (T_NS_SEPARATOR)" namespace_name .
   410 scalar: "\\ (T_NS_SEPARATOR)" namespace_name .
 
@@ -7045,7 +7045,7 @@ state 215
     $default                       reduce using rule 410 (scalar)
 
 
-state 216
+State 216
 
   308 expr_without_variable: new_expr .
   310                      | '(' new_expr . ')' @48 instance_call
@@ -7056,12 +7056,12 @@ state 216
     $default  reduce using rule 308 (expr_without_variable)
 
 
-state 217
+State 217
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -7084,8 +7084,8 @@ state 217
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
   307                      | '(' expr . ')'
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -7116,19 +7116,19 @@ state 217
     ')'                           shift, and go to state 364
 
 
-state 218
+State 218
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
    35 unticked_statement: '{' inner_statement_list . '}'
 
     '}'  shift, and go to state 365
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
-state 219
+State 219
 
   461 compound_variable: '$' '{' . expr '}'
 
@@ -7209,7 +7209,7 @@ state 219
     class_constant                     go to state 115
 
 
-state 220
+State 220
 
   379 backticks_expr: "quoted-string and whitespace (T_ENCAPSED_AND_WHITESPACE)" .
   493 encaps_list: "quoted-string and whitespace (T_ENCAPSED_AND_WHITESPACE)" . encaps_var
@@ -7223,14 +7223,14 @@ state 220
     encaps_var  go to state 351
 
 
-state 221
+State 221
 
   330 expr_without_variable: '`' backticks_expr . '`'
 
     '`'  shift, and go to state 368
 
 
-state 222
+State 222
 
   380 backticks_expr: encaps_list .
   490 encaps_list: encaps_list . encaps_var
@@ -7246,7 +7246,7 @@ state 222
     encaps_var  go to state 357
 
 
-state 223
+State 223
 
   493 encaps_list: "quoted-string and whitespace (T_ENCAPSED_AND_WHITESPACE)" . encaps_var
 
@@ -7257,7 +7257,7 @@ state 223
     encaps_var  go to state 351
 
 
-state 224
+State 224
 
   412 scalar: '"' encaps_list . '"'
   490 encaps_list: encaps_list . encaps_var
@@ -7272,39 +7272,39 @@ state 224
     encaps_var  go to state 357
 
 
-state 225
+State 225
 
     6 namespace_name: namespace_name "\\ (T_NS_SEPARATOR)" . "identifier (T_STRING)"
 
     "identifier (T_STRING)"  shift, and go to state 370
 
 
-state 226
+State 226
 
-  344 function_call: namespace_name '(' . @55 function_call_parameter_list ')'
+  344 function_call: namespace_name '(' . $@55 function_call_parameter_list ')'
 
-    $default  reduce using rule 343 (@55)
+    $default  reduce using rule 343 ($@55)
 
-    @55  go to state 371
+    $@55  go to state 371
 
 
-state 227
+State 227
 
    24 constant_declaration: constant_declaration ',' . "identifier (T_STRING)" '=' static_scalar
 
     "identifier (T_STRING)"  shift, and go to state 372
 
 
-state 228
+State 228
 
    17 top_statement: constant_declaration ';' .
 
     $default  reduce using rule 17 (top_statement)
 
 
-state 229
+State 229
 
-  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" . extends_from @30 implements_list '{' class_statement_list '}'
+  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" . extends_from $@30 implements_list '{' class_statement_list '}'
 
     "extends (T_EXTENDS)"  shift, and go to state 373
 
@@ -7313,42 +7313,42 @@ state 229
     extends_from  go to state 374
 
 
-state 230
+State 230
 
-  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" . @31 interface_extends_list '{' class_statement_list '}'
+  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" . $@31 interface_extends_list '{' class_statement_list '}'
 
-    $default  reduce using rule 102 (@31)
+    $default  reduce using rule 102 ($@31)
 
-    @31  go to state 375
+    $@31  go to state 375
 
 
-state 231
+State 231
 
    97 is_reference: '&' .
 
     $default  reduce using rule 97 (is_reference)
 
 
-state 232
+State 232
 
-   99 unticked_function_declaration_statement: function is_reference . "identifier (T_STRING)" @29 '(' parameter_list ')' '{' inner_statement_list '}'
+   99 unticked_function_declaration_statement: function is_reference . "identifier (T_STRING)" $@29 '(' parameter_list ')' '{' inner_statement_list '}'
   333 expr_without_variable: function is_reference . '(' @53 parameter_list ')' lexical_vars '{' inner_statement_list '}'
 
     "identifier (T_STRING)"  shift, and go to state 376
     '('                      shift, and go to state 377
 
 
-state 233
+State 233
 
-  450 array_function_dereference: function_call @69 . '[' dim_offset ']'
+  450 array_function_dereference: function_call $@69 . '[' dim_offset ']'
 
     '['  shift, and go to state 378
 
 
-state 234
+State 234
 
-  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_name '(' @58 function_call_parameter_list ')'
-  352              | class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects '(' @59 function_call_parameter_list ')'
+  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_name '(' $@58 function_call_parameter_list ')'
+  352              | class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects '(' $@59 function_call_parameter_list ')'
   445 static_member: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects
   514 class_constant: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . "identifier (T_STRING)"
 
@@ -7364,16 +7364,16 @@ state 234
     simple_indirect_reference  go to state 384
 
 
-state 235
+State 235
 
-  279 expr_without_variable: expr "or (T_LOGICAL_OR)" . @46 expr
+  279 expr_without_variable: expr "or (T_LOGICAL_OR)" . $@46 expr
 
-    $default  reduce using rule 278 (@46)
+    $default  reduce using rule 278 ($@46)
 
-    @46  go to state 385
+    $@46  go to state 385
 
 
-state 236
+State 236
 
   282 expr_without_variable: expr "xor (T_LOGICAL_XOR)" . expr
 
@@ -7454,46 +7454,46 @@ state 236
     class_constant                     go to state 115
 
 
-state 237
+State 237
 
-  281 expr_without_variable: expr "and (T_LOGICAL_AND)" . @47 expr
+  281 expr_without_variable: expr "and (T_LOGICAL_AND)" . $@47 expr
 
-    $default  reduce using rule 280 (@47)
+    $default  reduce using rule 280 ($@47)
 
-    @47  go to state 387
+    $@47  go to state 387
 
 
-state 238
+State 238
 
-  313 expr_without_variable: expr '?' . @49 expr ':' @50 expr
-  315                      | expr '?' . ':' @51 expr
+  313 expr_without_variable: expr '?' . $@49 expr ':' $@50 expr
+  315                      | expr '?' . ':' $@51 expr
 
     ':'  shift, and go to state 388
 
-    $default  reduce using rule 311 (@49)
+    $default  reduce using rule 311 ($@49)
 
-    @49  go to state 389
+    $@49  go to state 389
 
 
-state 239
+State 239
 
-  275 expr_without_variable: expr "|| (T_BOOLEAN_OR)" . @44 expr
+  275 expr_without_variable: expr "|| (T_BOOLEAN_OR)" . $@44 expr
 
-    $default  reduce using rule 274 (@44)
+    $default  reduce using rule 274 ($@44)
 
-    @44  go to state 390
+    $@44  go to state 390
 
 
-state 240
+State 240
 
-  277 expr_without_variable: expr "&& (T_BOOLEAN_AND)" . @45 expr
+  277 expr_without_variable: expr "&& (T_BOOLEAN_AND)" . $@45 expr
 
-    $default  reduce using rule 276 (@45)
+    $default  reduce using rule 276 ($@45)
 
-    @45  go to state 391
+    $@45  go to state 391
 
 
-state 241
+State 241
 
   283 expr_without_variable: expr '|' . expr
 
@@ -7574,7 +7574,7 @@ state 241
     class_constant                     go to state 115
 
 
-state 242
+State 242
 
   285 expr_without_variable: expr '^' . expr
 
@@ -7655,7 +7655,7 @@ state 242
     class_constant                     go to state 115
 
 
-state 243
+State 243
 
   284 expr_without_variable: expr '&' . expr
 
@@ -7736,7 +7736,7 @@ state 243
     class_constant                     go to state 115
 
 
-state 244
+State 244
 
   299 expr_without_variable: expr "!== (T_IS_NOT_IDENTICAL)" . expr
 
@@ -7817,7 +7817,7 @@ state 244
     class_constant                     go to state 115
 
 
-state 245
+State 245
 
   298 expr_without_variable: expr "=== (T_IS_IDENTICAL)" . expr
 
@@ -7898,7 +7898,7 @@ state 245
     class_constant                     go to state 115
 
 
-state 246
+State 246
 
   301 expr_without_variable: expr "!= (T_IS_NOT_EQUAL)" . expr
 
@@ -7979,7 +7979,7 @@ state 246
     class_constant                     go to state 115
 
 
-state 247
+State 247
 
   300 expr_without_variable: expr "== (T_IS_EQUAL)" . expr
 
@@ -8060,7 +8060,7 @@ state 247
     class_constant                     go to state 115
 
 
-state 248
+State 248
 
   302 expr_without_variable: expr '<' . expr
 
@@ -8141,7 +8141,7 @@ state 248
     class_constant                     go to state 115
 
 
-state 249
+State 249
 
   304 expr_without_variable: expr '>' . expr
 
@@ -8222,7 +8222,7 @@ state 249
     class_constant                     go to state 115
 
 
-state 250
+State 250
 
   305 expr_without_variable: expr ">= (T_IS_GREATER_OR_EQUAL)" . expr
 
@@ -8303,7 +8303,7 @@ state 250
     class_constant                     go to state 115
 
 
-state 251
+State 251
 
   303 expr_without_variable: expr "<= (T_IS_SMALLER_OR_EQUAL)" . expr
 
@@ -8384,7 +8384,7 @@ state 251
     class_constant                     go to state 115
 
 
-state 252
+State 252
 
   293 expr_without_variable: expr ">> (T_SR)" . expr
 
@@ -8465,7 +8465,7 @@ state 252
     class_constant                     go to state 115
 
 
-state 253
+State 253
 
   292 expr_without_variable: expr "<< (T_SL)" . expr
 
@@ -8546,7 +8546,7 @@ state 253
     class_constant                     go to state 115
 
 
-state 254
+State 254
 
   287 expr_without_variable: expr '+' . expr
 
@@ -8627,7 +8627,7 @@ state 254
     class_constant                     go to state 115
 
 
-state 255
+State 255
 
   288 expr_without_variable: expr '-' . expr
 
@@ -8708,7 +8708,7 @@ state 255
     class_constant                     go to state 115
 
 
-state 256
+State 256
 
   286 expr_without_variable: expr '.' . expr
 
@@ -8789,7 +8789,7 @@ state 256
     class_constant                     go to state 115
 
 
-state 257
+State 257
 
   289 expr_without_variable: expr '*' . expr
 
@@ -8870,7 +8870,7 @@ state 257
     class_constant                     go to state 115
 
 
-state 258
+State 258
 
   290 expr_without_variable: expr '/' . expr
 
@@ -8951,7 +8951,7 @@ state 258
     class_constant                     go to state 115
 
 
-state 259
+State 259
 
   291 expr_without_variable: expr '%' . expr
 
@@ -9032,7 +9032,7 @@ state 259
     class_constant                     go to state 115
 
 
-state 260
+State 260
 
   306 expr_without_variable: expr "instanceof (T_INSTANCEOF)" . class_name_reference
 
@@ -9055,32 +9055,32 @@ state 260
     simple_indirect_reference     go to state 161
 
 
-state 261
+State 261
 
    65 unticked_statement: expr ';' .
 
     $default  reduce using rule 65 (unticked_statement)
 
 
-state 262
+State 262
 
   272 expr_without_variable: rw_variable "-- (T_DEC)" .
 
     $default  reduce using rule 272 (expr_without_variable)
 
 
-state 263
+State 263
 
   270 expr_without_variable: rw_variable "++ (T_INC)" .
 
     $default  reduce using rule 270 (expr_without_variable)
 
 
-state 264
+State 264
 
   254 expr_without_variable: variable '=' . expr
   255                      | variable '=' . '&' variable
-  257                      | variable '=' . '&' "new (T_NEW)" class_name_reference @43 ctor_arguments
+  257                      | variable '=' . '&' "new (T_NEW)" class_name_reference $@43 ctor_arguments
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -9160,7 +9160,7 @@ state 264
     class_constant                     go to state 115
 
 
-state 265
+State 265
 
   269 expr_without_variable: variable ">>= (T_SR_EQUAL)" . expr
 
@@ -9241,7 +9241,7 @@ state 265
     class_constant                     go to state 115
 
 
-state 266
+State 266
 
   268 expr_without_variable: variable "<<= (T_SL_EQUAL)" . expr
 
@@ -9322,7 +9322,7 @@ state 266
     class_constant                     go to state 115
 
 
-state 267
+State 267
 
   267 expr_without_variable: variable "^= (T_XOR_EQUAL)" . expr
 
@@ -9403,7 +9403,7 @@ state 267
     class_constant                     go to state 115
 
 
-state 268
+State 268
 
   266 expr_without_variable: variable "|= (T_OR_EQUAL)" . expr
 
@@ -9484,7 +9484,7 @@ state 268
     class_constant                     go to state 115
 
 
-state 269
+State 269
 
   265 expr_without_variable: variable "&= (T_AND_EQUAL)" . expr
 
@@ -9565,7 +9565,7 @@ state 269
     class_constant                     go to state 115
 
 
-state 270
+State 270
 
   264 expr_without_variable: variable "%= (T_MOD_EQUAL)" . expr
 
@@ -9646,7 +9646,7 @@ state 270
     class_constant                     go to state 115
 
 
-state 271
+State 271
 
   263 expr_without_variable: variable ".= (T_CONCAT_EQUAL)" . expr
 
@@ -9727,7 +9727,7 @@ state 271
     class_constant                     go to state 115
 
 
-state 272
+State 272
 
   262 expr_without_variable: variable "/= (T_DIV_EQUAL)" . expr
 
@@ -9808,7 +9808,7 @@ state 272
     class_constant                     go to state 115
 
 
-state 273
+State 273
 
   261 expr_without_variable: variable "*= (T_MUL_EQUAL)" . expr
 
@@ -9889,7 +9889,7 @@ state 273
     class_constant                     go to state 115
 
 
-state 274
+State 274
 
   260 expr_without_variable: variable "-= (T_MINUS_EQUAL)" . expr
 
@@ -9970,7 +9970,7 @@ state 274
     class_constant                     go to state 115
 
 
-state 275
+State 275
 
   259 expr_without_variable: variable "+= (T_PLUS_EQUAL)" . expr
 
@@ -10051,19 +10051,19 @@ state 275
     class_constant                     go to state 115
 
 
-state 276
+State 276
 
-  358 function_call: variable_without_objects '(' . @62 function_call_parameter_list ')'
+  358 function_call: variable_without_objects '(' . $@62 function_call_parameter_list ')'
 
-    $default  reduce using rule 357 (@62)
+    $default  reduce using rule 357 ($@62)
 
-    @62  go to state 425
+    $@62  go to state 425
 
 
-state 277
+State 277
 
-  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_name '(' @60 function_call_parameter_list ')'
-  356              | variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects '(' @61 function_call_parameter_list ')'
+  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_name '(' $@60 function_call_parameter_list ')'
+  356              | variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects '(' $@61 function_call_parameter_list ')'
   446 static_member: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects
   515 class_constant: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . "identifier (T_STRING)"
 
@@ -10079,7 +10079,7 @@ state 277
     simple_indirect_reference  go to state 384
 
 
-state 278
+State 278
 
   448 array_function_dereference: array_function_dereference '[' . dim_offset ']'
 
@@ -10163,16 +10163,16 @@ state 278
     class_constant                     go to state 115
 
 
-state 279
+State 279
 
-  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" . @65 object_property @66 method_or_not variable_properties
+  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" . $@65 object_property $@66 method_or_not variable_properties
 
-    $default  reduce using rule 428 (@65)
+    $default  reduce using rule 428 ($@65)
 
-    @65  go to state 431
+    $@65  go to state 431
 
 
-state 280
+State 280
 
   457 reference_variable: reference_variable '[' . dim_offset ']'
 
@@ -10256,7 +10256,7 @@ state 280
     class_constant                     go to state 115
 
 
-state 281
+State 281
 
   458 reference_variable: reference_variable '{' . expr '}'
 
@@ -10337,7 +10337,7 @@ state 281
     class_constant                     go to state 115
 
 
-state 282
+State 282
 
   461 compound_variable: '$' . '{' expr '}'
   473 simple_indirect_reference: simple_indirect_reference '$' .
@@ -10347,7 +10347,7 @@ state 282
     $default  reduce using rule 473 (simple_indirect_reference)
 
 
-state 283
+State 283
 
   444 variable_without_objects: simple_indirect_reference reference_variable .
   455 base_variable: simple_indirect_reference reference_variable .
@@ -10361,19 +10361,19 @@ state 283
     $default  reduce using rule 455 (base_variable)
 
 
-state 284
+State 284
 
   333 expr_without_variable: function is_reference . '(' @53 parameter_list ')' lexical_vars '{' inner_statement_list '}'
 
     '('  shift, and go to state 377
 
 
-state 285
+State 285
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -10395,8 +10395,8 @@ state 285
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   508 internal_functions_in_yacc: "eval (T_EVAL)" '(' expr . ')'
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -10428,12 +10428,12 @@ state 285
     ')'                           shift, and go to state 434
 
 
-state 286
+State 286
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -10455,16 +10455,16 @@ state 286
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
-  326                      | '@' @52 expr .
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
+  326                      | '@' $@52 expr .
 
     $default  reduce using rule 326 (expr_without_variable)
 
 
-state 287
+State 287
 
-  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" . namespace_name '(' @56 function_call_parameter_list ')'
+  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" . namespace_name '(' $@56 function_call_parameter_list ')'
   361 class_name: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" . namespace_name
 
     "identifier (T_STRING)"  shift, and go to state 116
@@ -10472,10 +10472,10 @@ state 287
     namespace_name  go to state 435
 
 
-state 288
+State 288
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
-  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name . '(' @57 function_call_parameter_list ')'
+  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name . '(' $@57 function_call_parameter_list ')'
   362 class_name: "\\ (T_NS_SEPARATOR)" namespace_name .
 
     "\\ (T_NS_SEPARATOR)"  shift, and go to state 225
@@ -10484,10 +10484,10 @@ state 288
     $default  reduce using rule 362 (class_name)
 
 
-state 289
+State 289
 
-  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_name '(' @58 function_call_parameter_list ')'
-  352              | class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects '(' @59 function_call_parameter_list ')'
+  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_name '(' $@58 function_call_parameter_list ')'
+  352              | class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects '(' $@59 function_call_parameter_list ')'
   445 static_member: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects
 
     "identifier (T_STRING)"  shift, and go to state 436
@@ -10502,10 +10502,10 @@ state 289
     simple_indirect_reference  go to state 384
 
 
-state 290
+State 290
 
-  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_name '(' @60 function_call_parameter_list ')'
-  356              | variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects '(' @61 function_call_parameter_list ')'
+  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_name '(' $@60 function_call_parameter_list ')'
+  356              | variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects '(' $@61 function_call_parameter_list ')'
   446 static_member: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects
 
     "identifier (T_STRING)"  shift, and go to state 436
@@ -10520,21 +10520,21 @@ state 290
     simple_indirect_reference  go to state 384
 
 
-state 291
+State 291
 
   489 non_empty_array_pair_list: '&' w_variable .
 
     $default  reduce using rule 489 (non_empty_array_pair_list)
 
 
-state 292
+State 292
 
   426 w_variable: variable .
 
     $default  reduce using rule 426 (w_variable)
 
 
-state 293
+State 293
 
   484 non_empty_array_pair_list: expr "=> (T_DOUBLE_ARROW)" . expr
   488                          | expr "=> (T_DOUBLE_ARROW)" . '&' w_variable
@@ -10617,14 +10617,14 @@ state 293
     class_constant                     go to state 115
 
 
-state 294
+State 294
 
   329 expr_without_variable: '[' array_pair_list ']' .
 
     $default  reduce using rule 329 (expr_without_variable)
 
 
-state 295
+State 295
 
   418 possible_comma: ',' .
   482 non_empty_array_pair_list: non_empty_array_pair_list ',' . expr "=> (T_DOUBLE_ARROW)" expr
@@ -10712,14 +10712,14 @@ state 295
     class_constant                     go to state 115
 
 
-state 296
+State 296
 
   481 array_pair_list: non_empty_array_pair_list possible_comma .
 
     $default  reduce using rule 481 (array_pair_list)
 
 
-state 297
+State 297
 
   361 class_name: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" . namespace_name
 
@@ -10728,7 +10728,7 @@ state 297
     namespace_name  go to state 441
 
 
-state 298
+State 298
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
   362 class_name: "\\ (T_NS_SEPARATOR)" namespace_name .
@@ -10738,7 +10738,7 @@ state 298
     $default  reduce using rule 362 (class_name)
 
 
-state 299
+State 299
 
   445 static_member: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects
 
@@ -10751,9 +10751,9 @@ state 299
     simple_indirect_reference  go to state 384
 
 
-state 300
+State 300
 
-  251 new_expr: "new (T_NEW)" class_name_reference @41 . ctor_arguments
+  251 new_expr: "new (T_NEW)" class_name_reference $@41 . ctor_arguments
 
     '('  shift, and go to state 443
 
@@ -10762,7 +10762,7 @@ state 300
     ctor_arguments  go to state 444
 
 
-state 301
+State 301
 
   446 static_member: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . variable_without_objects
 
@@ -10775,16 +10775,16 @@ state 301
     simple_indirect_reference  go to state 384
 
 
-state 302
+State 302
 
-  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" . @63 object_property @64 dynamic_class_name_variable_properties
+  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" . $@63 object_property $@64 dynamic_class_name_variable_properties
 
-    $default  reduce using rule 368 (@63)
+    $default  reduce using rule 368 ($@63)
 
-    @63  go to state 446
+    $@63  go to state 446
 
 
-state 303
+State 303
 
   455 base_variable: simple_indirect_reference reference_variable .
   457 reference_variable: reference_variable . '[' dim_offset ']'
@@ -10796,19 +10796,19 @@ state 303
     $default  reduce using rule 455 (base_variable)
 
 
-state 304
+State 304
 
   376 exit_expr: '(' ')' .
 
     $default  reduce using rule 376 (exit_expr)
 
 
-state 305
+State 305
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -10830,8 +10830,8 @@ state 305
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   377 exit_expr: '(' expr . ')'
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -10863,14 +10863,14 @@ state 305
     ')'                           shift, and go to state 447
 
 
-state 306
+State 306
 
-   38 unticked_statement: "if (T_IF)" '(' expr . ')' @5 statement @6 elseif_list else_single
-   41                   | "if (T_IF)" '(' expr . ')' ':' @7 inner_statement_list @8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+   38 unticked_statement: "if (T_IF)" '(' expr . ')' $@5 statement $@6 elseif_list else_single
+   41                   | "if (T_IF)" '(' expr . ')' ':' $@7 inner_statement_list $@8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -10892,8 +10892,8 @@ state 306
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -10924,7 +10924,7 @@ state 306
     ')'                           shift, and go to state 448
 
 
-state 307
+State 307
 
   232 echo_expr_list: echo_expr_list ',' . expr
 
@@ -11005,23 +11005,23 @@ state 307
     class_constant                     go to state 115
 
 
-state 308
+State 308
 
    63 unticked_statement: "echo (T_ECHO)" echo_expr_list ';' .
 
     $default  reduce using rule 63 (unticked_statement)
 
 
-state 309
+State 309
 
-   47 unticked_statement: "do (T_DO)" @11 statement . "while (T_WHILE)" '(' @12 expr ')' ';'
+   47 unticked_statement: "do (T_DO)" $@11 statement . "while (T_WHILE)" '(' $@12 expr ')' ';'
 
     "while (T_WHILE)"  shift, and go to state 450
 
 
-state 310
+State 310
 
-   44 unticked_statement: "while (T_WHILE)" '(' @9 . expr ')' @10 while_statement
+   44 unticked_statement: "while (T_WHILE)" '(' $@9 . expr ')' $@10 while_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -11100,30 +11100,30 @@ state 310
     class_constant                     go to state 115
 
 
-state 311
+State 311
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr . ';' @13 for_expr ';' @14 for_expr ')' @15 for_statement
+   51 unticked_statement: "for (T_FOR)" '(' for_expr . ';' $@13 for_expr ';' $@14 for_expr ')' $@15 for_statement
 
     ';'  shift, and go to state 452
 
 
-state 312
+State 312
 
   235 for_expr: non_empty_for_expr .
-  237 non_empty_for_expr: non_empty_for_expr . ',' @38 expr
+  237 non_empty_for_expr: non_empty_for_expr . ',' $@38 expr
 
     ','  shift, and go to state 453
 
     $default  reduce using rule 235 (for_expr)
 
 
-state 313
+State 313
 
   238 non_empty_for_expr: expr .
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -11145,8 +11145,8 @@ state 313
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -11178,9 +11178,9 @@ state 313
     $default  reduce using rule 238 (non_empty_for_expr)
 
 
-state 314
+State 314
 
-   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable . "as (T_AS)" @19 variable foreach_optional_arg ')' @20 foreach_statement
+   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable . "as (T_AS)" $@19 variable foreach_optional_arg ')' $@20 foreach_statement
   424 expr: expr_without_variable .
 
     "as (T_AS)"  shift, and go to state 454
@@ -11188,12 +11188,12 @@ state 314
     $default  reduce using rule 424 (expr)
 
 
-state 315
+State 315
 
-   69 unticked_statement: "foreach (T_FOREACH)" '(' variable . "as (T_AS)" @17 foreach_variable foreach_optional_arg ')' @18 foreach_statement
+   69 unticked_statement: "foreach (T_FOREACH)" '(' variable . "as (T_AS)" $@17 foreach_variable foreach_optional_arg ')' $@18 foreach_statement
   254 expr_without_variable: variable . '=' expr
   255                      | variable . '=' '&' variable
-  257                      | variable . '=' '&' "new (T_NEW)" class_name_reference @43 ctor_arguments
+  257                      | variable . '=' '&' "new (T_NEW)" class_name_reference $@43 ctor_arguments
   259                      | variable . "+= (T_PLUS_EQUAL)" expr
   260                      | variable . "-= (T_MINUS_EQUAL)" expr
   261                      | variable . "*= (T_MUL_EQUAL)" expr
@@ -11227,22 +11227,22 @@ state 315
     $default      reduce using rule 425 (r_variable)
 
 
-state 316
+State 316
 
-   74 unticked_statement: "declare (T_DECLARE)" @21 '(' . declare_list ')' declare_statement
+   74 unticked_statement: "declare (T_DECLARE)" $@21 '(' . declare_list ')' declare_statement
 
     "identifier (T_STRING)"  shift, and go to state 456
 
     declare_list  go to state 457
 
 
-state 317
+State 317
 
-   53 unticked_statement: "switch (T_SWITCH)" '(' expr . ')' @16 switch_case_list
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+   53 unticked_statement: "switch (T_SWITCH)" '(' expr . ')' $@16 switch_case_list
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -11264,8 +11264,8 @@ state 317
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -11296,28 +11296,28 @@ state 317
     ')'                           shift, and go to state 458
 
 
-state 318
+State 318
 
    55 unticked_statement: "break (T_BREAK)" expr ';' .
 
     $default  reduce using rule 55 (unticked_statement)
 
 
-state 319
+State 319
 
    57 unticked_statement: "continue (T_CONTINUE)" expr ';' .
 
     $default  reduce using rule 57 (unticked_statement)
 
 
-state 320
+State 320
 
    83 unticked_statement: "goto (T_GOTO)" "identifier (T_STRING)" ';' .
 
     $default  reduce using rule 83 (unticked_statement)
 
 
-state 321
+State 321
 
    25 constant_declaration: "const (T_CONST)" "identifier (T_STRING)" '=' . static_scalar
 
@@ -11349,37 +11349,37 @@ state 321
     static_class_constant  go to state 471
 
 
-state 322
+State 322
 
    59 unticked_statement: "return (T_RETURN)" expr_without_variable ';' .
 
     $default  reduce using rule 59 (unticked_statement)
 
 
-state 323
+State 323
 
    60 unticked_statement: "return (T_RETURN)" variable ';' .
 
     $default  reduce using rule 60 (unticked_statement)
 
 
-state 324
+State 324
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' . inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' . inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
     $default  reduce using rule 28 (inner_statement_list)
 
     inner_statement_list  go to state 472
 
 
-state 325
+State 325
 
    82 unticked_statement: "throw (T_THROW)" expr ';' .
 
     $default  reduce using rule 82 (unticked_statement)
 
 
-state 326
+State 326
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
    22 use_declaration: "\\ (T_NS_SEPARATOR)" namespace_name .
@@ -11391,14 +11391,14 @@ state 326
     $default  reduce using rule 22 (use_declaration)
 
 
-state 327
+State 327
 
    21 use_declaration: namespace_name "as (T_AS)" . "identifier (T_STRING)"
 
     "identifier (T_STRING)"  shift, and go to state 474
 
 
-state 328
+State 328
 
    18 use_declarations: use_declarations ',' . use_declaration
 
@@ -11409,14 +11409,14 @@ state 328
     use_declaration  go to state 475
 
 
-state 329
+State 329
 
    16 top_statement: "use (T_USE)" use_declarations ';' .
 
     $default  reduce using rule 16 (top_statement)
 
 
-state 330
+State 330
 
   178 global_var: '$' '{' . expr '}'
 
@@ -11497,21 +11497,21 @@ state 330
     class_constant                     go to state 115
 
 
-state 331
+State 331
 
   177 global_var: '$' r_variable .
 
     $default  reduce using rule 177 (global_var)
 
 
-state 332
+State 332
 
   425 r_variable: variable .
 
     $default  reduce using rule 425 (r_variable)
 
 
-state 333
+State 333
 
   174 global_var_list: global_var_list ',' . global_var
 
@@ -11521,14 +11521,14 @@ state 333
     global_var  go to state 477
 
 
-state 334
+State 334
 
    61 unticked_statement: "global (T_GLOBAL)" global_var_list ';' .
 
     $default  reduce using rule 61 (unticked_statement)
 
 
-state 335
+State 335
 
   182 static_var_list: "variable (T_VARIABLE)" '=' . static_scalar
 
@@ -11560,7 +11560,7 @@ state 335
     static_class_constant  go to state 471
 
 
-state 336
+State 336
 
   179 static_var_list: static_var_list ',' . "variable (T_VARIABLE)"
   180                | static_var_list ',' . "variable (T_VARIABLE)" '=' static_scalar
@@ -11568,21 +11568,21 @@ state 336
     "variable (T_VARIABLE)"  shift, and go to state 479
 
 
-state 337
+State 337
 
    62 unticked_statement: "static (T_STATIC)" static_var_list ';' .
 
     $default  reduce using rule 62 (unticked_statement)
 
 
-state 338
+State 338
 
   335 expr_without_variable: "static (T_STATIC)" function is_reference . '(' @54 parameter_list ')' lexical_vars '{' inner_statement_list '}'
 
     '('  shift, and go to state 480
 
 
-state 339
+State 339
 
    66 unticked_statement: "unset (T_UNSET)" '(' unset_variables . ')' ';'
    92 unset_variables: unset_variables . ',' unset_variable
@@ -11591,53 +11591,53 @@ state 339
     ')'  shift, and go to state 482
 
 
-state 340
+State 340
 
    91 unset_variables: unset_variable .
 
     $default  reduce using rule 91 (unset_variables)
 
 
-state 341
+State 341
 
    93 unset_variable: variable .
 
     $default  reduce using rule 93 (unset_variable)
 
 
-state 342
+State 342
 
   511 isset_variables: variable .
 
     $default  reduce using rule 511 (isset_variables)
 
 
-state 343
+State 343
 
   504 internal_functions_in_yacc: "isset (T_ISSET)" '(' isset_variables . ')'
-  513 isset_variables: isset_variables . ',' @73 variable
+  513 isset_variables: isset_variables . ',' $@73 variable
 
     ','  shift, and go to state 483
     ')'  shift, and go to state 484
 
 
-state 344
+State 344
 
   505 internal_functions_in_yacc: "empty (T_EMPTY)" '(' variable . ')'
 
     ')'  shift, and go to state 485
 
 
-state 345
+State 345
 
    10 top_statement: "__halt_compiler (T_HALT_COMPILER)" '(' ')' . ';'
 
     ';'  shift, and go to state 486
 
 
-state 346
+State 346
 
-  253 expr_without_variable: "list (T_LIST)" '(' @42 . assignment_list ')' '=' expr
+  253 expr_without_variable: "list (T_LIST)" '(' $@42 . assignment_list ')' '=' expr
 
     "identifier (T_STRING)"    shift, and go to state 116
     "variable (T_VARIABLE)"    shift, and go to state 34
@@ -11666,44 +11666,44 @@ state 346
     assignment_list_element            go to state 490
 
 
-state 347
+State 347
 
   328 expr_without_variable: "array (T_ARRAY)" '(' array_pair_list . ')'
 
     ')'  shift, and go to state 491
 
 
-state 348
+State 348
 
-  496 encaps_var: "variable (T_VARIABLE)" '[' . @72 encaps_var_offset ']'
+  496 encaps_var: "variable (T_VARIABLE)" '[' . $@72 encaps_var_offset ']'
 
-    $default  reduce using rule 495 (@72)
+    $default  reduce using rule 495 ($@72)
 
-    @72  go to state 492
+    $@72  go to state 492
 
 
-state 349
+State 349
 
   497 encaps_var: "variable (T_VARIABLE)" "-> (T_OBJECT_OPERATOR)" . "identifier (T_STRING)"
 
     "identifier (T_STRING)"  shift, and go to state 493
 
 
-state 350
+State 350
 
   393 common_scalar: "heredoc start (T_START_HEREDOC)" "quoted-string and whitespace (T_ENCAPSED_AND_WHITESPACE)" "heredoc end (T_END_HEREDOC)" .
 
     $default  reduce using rule 393 (common_scalar)
 
 
-state 351
+State 351
 
   493 encaps_list: "quoted-string and whitespace (T_ENCAPSED_AND_WHITESPACE)" encaps_var .
 
     $default  reduce using rule 493 (encaps_list)
 
 
-state 352
+State 352
 
   406 scalar: "variable name (T_STRING_VARNAME)" .
   499 encaps_var: "${ (T_DOLLAR_OPEN_CURLY_BRACES)" "variable name (T_STRING_VARNAME)" . '[' expr ']' '}'
@@ -11713,12 +11713,12 @@ state 352
     $default  reduce using rule 406 (scalar)
 
 
-state 353
+State 353
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -11740,8 +11740,8 @@ state 353
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   498 encaps_var: "${ (T_DOLLAR_OPEN_CURLY_BRACES)" expr . '}'
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -11773,38 +11773,38 @@ state 353
     '}'                           shift, and go to state 495
 
 
-state 354
+State 354
 
   500 encaps_var: "{$ (T_CURLY_OPEN)" variable . '}'
 
     '}'  shift, and go to state 496
 
 
-state 355
+State 355
 
   491 encaps_list: encaps_list "quoted-string and whitespace (T_ENCAPSED_AND_WHITESPACE)" .
 
     $default  reduce using rule 491 (encaps_list)
 
 
-state 356
+State 356
 
   413 scalar: "heredoc start (T_START_HEREDOC)" encaps_list "heredoc end (T_END_HEREDOC)" .
 
     $default  reduce using rule 413 (scalar)
 
 
-state 357
+State 357
 
   490 encaps_list: encaps_list encaps_var .
 
     $default  reduce using rule 490 (encaps_list)
 
 
-state 358
+State 358
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
-  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name . '(' @56 function_call_parameter_list ')'
+  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name . '(' $@56 function_call_parameter_list ')'
   361 class_name: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name .
   409 scalar: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name .
 
@@ -11815,41 +11815,41 @@ state 358
     $default                       reduce using rule 409 (scalar)
 
 
-state 359
+State 359
 
-   15 top_statement: "namespace (T_NAMESPACE)" '{' @3 . top_statement_list '}'
+   15 top_statement: "namespace (T_NAMESPACE)" '{' $@3 . top_statement_list '}'
 
     $default  reduce using rule 4 (top_statement_list)
 
     top_statement_list  go to state 498
 
 
-state 360
+State 360
 
    11 top_statement: "namespace (T_NAMESPACE)" namespace_name ';' .
 
     $default  reduce using rule 11 (top_statement)
 
 
-state 361
+State 361
 
-   13 top_statement: "namespace (T_NAMESPACE)" namespace_name '{' . @2 top_statement_list '}'
+   13 top_statement: "namespace (T_NAMESPACE)" namespace_name '{' . $@2 top_statement_list '}'
 
-    $default  reduce using rule 12 (@2)
+    $default  reduce using rule 12 ($@2)
 
-    @2  go to state 499
+    $@2  go to state 499
 
 
-state 362
+State 362
 
-  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name '(' . @57 function_call_parameter_list ')'
+  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name '(' . $@57 function_call_parameter_list ')'
 
-    $default  reduce using rule 347 (@57)
+    $default  reduce using rule 347 ($@57)
 
-    @57  go to state 500
+    $@57  go to state 500
 
 
-state 363
+State 363
 
   310 expr_without_variable: '(' new_expr ')' . @48 instance_call
 
@@ -11858,23 +11858,23 @@ state 363
     @48  go to state 501
 
 
-state 364
+State 364
 
   307 expr_without_variable: '(' expr ')' .
 
     $default  reduce using rule 307 (expr_without_variable)
 
 
-state 365
+State 365
 
    35 unticked_statement: '{' inner_statement_list '}' .
 
     $default  reduce using rule 35 (unticked_statement)
 
 
-state 366
+State 366
 
-   27 inner_statement_list: inner_statement_list @4 . inner_statement
+   27 inner_statement_list: inner_statement_list $@4 . inner_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -11987,12 +11987,12 @@ state 366
     class_constant                           go to state 115
 
 
-state 367
+State 367
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -12014,8 +12014,8 @@ state 367
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   461 compound_variable: '$' '{' expr . '}'
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -12047,30 +12047,30 @@ state 367
     '}'                           shift, and go to state 507
 
 
-state 368
+State 368
 
   330 expr_without_variable: '`' backticks_expr '`' .
 
     $default  reduce using rule 330 (expr_without_variable)
 
 
-state 369
+State 369
 
   412 scalar: '"' encaps_list '"' .
 
     $default  reduce using rule 412 (scalar)
 
 
-state 370
+State 370
 
     6 namespace_name: namespace_name "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)" .
 
     $default  reduce using rule 6 (namespace_name)
 
 
-state 371
+State 371
 
-  344 function_call: namespace_name '(' @55 . function_call_parameter_list ')'
+  344 function_call: namespace_name '(' $@55 . function_call_parameter_list ')'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -12154,14 +12154,14 @@ state 371
     class_constant                          go to state 115
 
 
-state 372
+State 372
 
    24 constant_declaration: constant_declaration ',' "identifier (T_STRING)" . '=' static_scalar
 
     '='  shift, and go to state 513
 
 
-state 373
+State 373
 
   109 extends_from: "extends (T_EXTENDS)" . fully_qualified_class_name
 
@@ -12173,18 +12173,18 @@ state 373
     fully_qualified_class_name  go to state 517
 
 
-state 374
+State 374
 
-  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from . @30 implements_list '{' class_statement_list '}'
+  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from . $@30 implements_list '{' class_statement_list '}'
 
-    $default  reduce using rule 100 (@30)
+    $default  reduce using rule 100 ($@30)
 
-    @30  go to state 518
+    $@30  go to state 518
 
 
-state 375
+State 375
 
-  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" @31 . interface_extends_list '{' class_statement_list '}'
+  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" $@31 . interface_extends_list '{' class_statement_list '}'
 
     "extends (T_EXTENDS)"  shift, and go to state 519
 
@@ -12193,16 +12193,16 @@ state 375
     interface_extends_list  go to state 520
 
 
-state 376
+State 376
 
-   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" . @29 '(' parameter_list ')' '{' inner_statement_list '}'
+   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" . $@29 '(' parameter_list ')' '{' inner_statement_list '}'
 
-    $default  reduce using rule 98 (@29)
+    $default  reduce using rule 98 ($@29)
 
-    @29  go to state 521
+    $@29  go to state 521
 
 
-state 377
+State 377
 
   333 expr_without_variable: function is_reference '(' . @53 parameter_list ')' lexical_vars '{' inner_statement_list '}'
 
@@ -12211,9 +12211,9 @@ state 377
     @53  go to state 522
 
 
-state 378
+State 378
 
-  450 array_function_dereference: function_call @69 '[' . dim_offset ']'
+  450 array_function_dereference: function_call $@69 '[' . dim_offset ']'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -12295,7 +12295,7 @@ state 378
     class_constant                     go to state 115
 
 
-state 379
+State 379
 
   470 variable_name: "identifier (T_STRING)" .
   514 class_constant: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" "identifier (T_STRING)" .
@@ -12304,7 +12304,7 @@ state 379
     $default  reduce using rule 514 (class_constant)
 
 
-state 380
+State 380
 
   471 variable_name: '{' . expr '}'
 
@@ -12385,9 +12385,9 @@ state 380
     class_constant                     go to state 115
 
 
-state 381
+State 381
 
-  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects . '(' @59 function_call_parameter_list ')'
+  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects . '(' $@59 function_call_parameter_list ')'
   445 static_member: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects .
 
     '('  shift, and go to state 525
@@ -12395,7 +12395,7 @@ state 381
     $default  reduce using rule 445 (static_member)
 
 
-state 382
+State 382
 
   443 variable_without_objects: reference_variable .
   457 reference_variable: reference_variable . '[' dim_offset ']'
@@ -12407,14 +12407,14 @@ state 382
     $default  reduce using rule 443 (variable_without_objects)
 
 
-state 383
+State 383
 
-  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name . '(' @58 function_call_parameter_list ')'
+  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name . '(' $@58 function_call_parameter_list ')'
 
     '('  shift, and go to state 526
 
 
-state 384
+State 384
 
   444 variable_without_objects: simple_indirect_reference . reference_variable
   473 simple_indirect_reference: simple_indirect_reference . '$'
@@ -12426,9 +12426,9 @@ state 384
     compound_variable   go to state 112
 
 
-state 385
+State 385
 
-  279 expr_without_variable: expr "or (T_LOGICAL_OR)" @46 . expr
+  279 expr_without_variable: expr "or (T_LOGICAL_OR)" $@46 . expr
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -12507,12 +12507,12 @@ state 385
     class_constant                     go to state 115
 
 
-state 386
+State 386
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   282                      | expr "xor (T_LOGICAL_XOR)" expr .
   283                      | expr . '|' expr
@@ -12535,8 +12535,8 @@ state 386
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "and (T_LOGICAL_AND)"         shift, and go to state 237
     '?'                           shift, and go to state 238
@@ -12566,9 +12566,9 @@ state 386
     $default  reduce using rule 282 (expr_without_variable)
 
 
-state 387
+State 387
 
-  281 expr_without_variable: expr "and (T_LOGICAL_AND)" @47 . expr
+  281 expr_without_variable: expr "and (T_LOGICAL_AND)" $@47 . expr
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -12647,18 +12647,18 @@ state 387
     class_constant                     go to state 115
 
 
-state 388
+State 388
 
-  315 expr_without_variable: expr '?' ':' . @51 expr
+  315 expr_without_variable: expr '?' ':' . $@51 expr
 
-    $default  reduce using rule 314 (@51)
+    $default  reduce using rule 314 ($@51)
 
-    @51  go to state 530
+    $@51  go to state 530
 
 
-state 389
+State 389
 
-  313 expr_without_variable: expr '?' @49 . expr ':' @50 expr
+  313 expr_without_variable: expr '?' $@49 . expr ':' $@50 expr
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -12737,9 +12737,9 @@ state 389
     class_constant                     go to state 115
 
 
-state 390
+State 390
 
-  275 expr_without_variable: expr "|| (T_BOOLEAN_OR)" @44 . expr
+  275 expr_without_variable: expr "|| (T_BOOLEAN_OR)" $@44 . expr
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -12818,9 +12818,9 @@ state 390
     class_constant                     go to state 115
 
 
-state 391
+State 391
 
-  277 expr_without_variable: expr "&& (T_BOOLEAN_AND)" @45 . expr
+  277 expr_without_variable: expr "&& (T_BOOLEAN_AND)" $@45 . expr
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -12899,12 +12899,12 @@ state 391
     class_constant                     go to state 115
 
 
-state 392
+State 392
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   283                      | expr '|' expr .
@@ -12927,8 +12927,8 @@ state 392
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '^'                           shift, and go to state 242
     '&'                           shift, and go to state 243
@@ -12953,12 +12953,12 @@ state 392
     $default  reduce using rule 283 (expr_without_variable)
 
 
-state 393
+State 393
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -12981,8 +12981,8 @@ state 393
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '&'                           shift, and go to state 243
     "!== (T_IS_NOT_IDENTICAL)"    shift, and go to state 244
@@ -13006,12 +13006,12 @@ state 393
     $default  reduce using rule 285 (expr_without_variable)
 
 
-state 394
+State 394
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13034,8 +13034,8 @@ state 394
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "!== (T_IS_NOT_IDENTICAL)"    shift, and go to state 244
     "=== (T_IS_IDENTICAL)"        shift, and go to state 245
@@ -13058,12 +13058,12 @@ state 394
     $default  reduce using rule 284 (expr_without_variable)
 
 
-state 395
+State 395
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13086,8 +13086,8 @@ state 395
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '<'                           shift, and go to state 248
     '>'                           shift, and go to state 249
@@ -13111,12 +13111,12 @@ state 395
     $default  reduce using rule 299 (expr_without_variable)
 
 
-state 396
+State 396
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13139,8 +13139,8 @@ state 396
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '<'                           shift, and go to state 248
     '>'                           shift, and go to state 249
@@ -13164,12 +13164,12 @@ state 396
     $default  reduce using rule 298 (expr_without_variable)
 
 
-state 397
+State 397
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13192,8 +13192,8 @@ state 397
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '<'                           shift, and go to state 248
     '>'                           shift, and go to state 249
@@ -13217,12 +13217,12 @@ state 397
     $default  reduce using rule 301 (expr_without_variable)
 
 
-state 398
+State 398
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13245,8 +13245,8 @@ state 398
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '<'                           shift, and go to state 248
     '>'                           shift, and go to state 249
@@ -13270,12 +13270,12 @@ state 398
     $default  reduce using rule 300 (expr_without_variable)
 
 
-state 399
+State 399
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13298,8 +13298,8 @@ state 399
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     ">> (T_SR)"                  shift, and go to state 252
     "<< (T_SL)"                  shift, and go to state 253
@@ -13319,12 +13319,12 @@ state 399
     $default  reduce using rule 302 (expr_without_variable)
 
 
-state 400
+State 400
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13347,8 +13347,8 @@ state 400
   304                      | expr '>' expr .
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     ">> (T_SR)"                  shift, and go to state 252
     "<< (T_SL)"                  shift, and go to state 253
@@ -13368,12 +13368,12 @@ state 400
     $default  reduce using rule 304 (expr_without_variable)
 
 
-state 401
+State 401
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13396,8 +13396,8 @@ state 401
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   305                      | expr ">= (T_IS_GREATER_OR_EQUAL)" expr .
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     ">> (T_SR)"                  shift, and go to state 252
     "<< (T_SL)"                  shift, and go to state 253
@@ -13417,12 +13417,12 @@ state 401
     $default  reduce using rule 305 (expr_without_variable)
 
 
-state 402
+State 402
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13445,8 +13445,8 @@ state 402
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     ">> (T_SR)"                  shift, and go to state 252
     "<< (T_SL)"                  shift, and go to state 253
@@ -13466,12 +13466,12 @@ state 402
     $default  reduce using rule 303 (expr_without_variable)
 
 
-state 403
+State 403
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13494,8 +13494,8 @@ state 403
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '+'                          shift, and go to state 254
     '-'                          shift, and go to state 255
@@ -13508,12 +13508,12 @@ state 403
     $default  reduce using rule 293 (expr_without_variable)
 
 
-state 404
+State 404
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13536,8 +13536,8 @@ state 404
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '+'                          shift, and go to state 254
     '-'                          shift, and go to state 255
@@ -13550,12 +13550,12 @@ state 404
     $default  reduce using rule 292 (expr_without_variable)
 
 
-state 405
+State 405
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13578,8 +13578,8 @@ state 405
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '*'                          shift, and go to state 257
     '/'                          shift, and go to state 258
@@ -13589,12 +13589,12 @@ state 405
     $default  reduce using rule 287 (expr_without_variable)
 
 
-state 406
+State 406
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13617,8 +13617,8 @@ state 406
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '*'                          shift, and go to state 257
     '/'                          shift, and go to state 258
@@ -13628,12 +13628,12 @@ state 406
     $default  reduce using rule 288 (expr_without_variable)
 
 
-state 407
+State 407
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13656,8 +13656,8 @@ state 407
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '*'                          shift, and go to state 257
     '/'                          shift, and go to state 258
@@ -13667,12 +13667,12 @@ state 407
     $default  reduce using rule 286 (expr_without_variable)
 
 
-state 408
+State 408
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13695,20 +13695,20 @@ state 408
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "instanceof (T_INSTANCEOF)"  shift, and go to state 260
 
     $default  reduce using rule 289 (expr_without_variable)
 
 
-state 409
+State 409
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13731,20 +13731,20 @@ state 409
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "instanceof (T_INSTANCEOF)"  shift, and go to state 260
 
     $default  reduce using rule 290 (expr_without_variable)
 
 
-state 410
+State 410
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13767,25 +13767,25 @@ state 410
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "instanceof (T_INSTANCEOF)"  shift, and go to state 260
 
     $default  reduce using rule 291 (expr_without_variable)
 
 
-state 411
+State 411
 
   306 expr_without_variable: expr "instanceof (T_INSTANCEOF)" class_name_reference .
 
     $default  reduce using rule 306 (expr_without_variable)
 
 
-state 412
+State 412
 
   255 expr_without_variable: variable '=' '&' . variable
-  257                      | variable '=' '&' . "new (T_NEW)" class_name_reference @43 ctor_arguments
+  257                      | variable '=' '&' . "new (T_NEW)" class_name_reference $@43 ctor_arguments
 
     "new (T_NEW)"              shift, and go to state 534
     "identifier (T_STRING)"    shift, and go to state 116
@@ -13810,13 +13810,13 @@ state 412
     simple_indirect_reference          go to state 113
 
 
-state 413
+State 413
 
   254 expr_without_variable: variable '=' expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13838,8 +13838,8 @@ state 413
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -13868,13 +13868,13 @@ state 413
     $default  reduce using rule 254 (expr_without_variable)
 
 
-state 414
+State 414
 
   269 expr_without_variable: variable ">>= (T_SR_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13896,8 +13896,8 @@ state 414
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -13926,13 +13926,13 @@ state 414
     $default  reduce using rule 269 (expr_without_variable)
 
 
-state 415
+State 415
 
   268 expr_without_variable: variable "<<= (T_SL_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -13954,8 +13954,8 @@ state 415
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -13984,13 +13984,13 @@ state 415
     $default  reduce using rule 268 (expr_without_variable)
 
 
-state 416
+State 416
 
   267 expr_without_variable: variable "^= (T_XOR_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14012,8 +14012,8 @@ state 416
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -14042,13 +14042,13 @@ state 416
     $default  reduce using rule 267 (expr_without_variable)
 
 
-state 417
+State 417
 
   266 expr_without_variable: variable "|= (T_OR_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14070,8 +14070,8 @@ state 417
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -14100,13 +14100,13 @@ state 417
     $default  reduce using rule 266 (expr_without_variable)
 
 
-state 418
+State 418
 
   265 expr_without_variable: variable "&= (T_AND_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14128,8 +14128,8 @@ state 418
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -14158,13 +14158,13 @@ state 418
     $default  reduce using rule 265 (expr_without_variable)
 
 
-state 419
+State 419
 
   264 expr_without_variable: variable "%= (T_MOD_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14186,8 +14186,8 @@ state 419
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -14216,13 +14216,13 @@ state 419
     $default  reduce using rule 264 (expr_without_variable)
 
 
-state 420
+State 420
 
   263 expr_without_variable: variable ".= (T_CONCAT_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14244,8 +14244,8 @@ state 420
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -14274,13 +14274,13 @@ state 420
     $default  reduce using rule 263 (expr_without_variable)
 
 
-state 421
+State 421
 
   262 expr_without_variable: variable "/= (T_DIV_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14302,8 +14302,8 @@ state 421
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -14332,13 +14332,13 @@ state 421
     $default  reduce using rule 262 (expr_without_variable)
 
 
-state 422
+State 422
 
   261 expr_without_variable: variable "*= (T_MUL_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14360,8 +14360,8 @@ state 422
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -14390,13 +14390,13 @@ state 422
     $default  reduce using rule 261 (expr_without_variable)
 
 
-state 423
+State 423
 
   260 expr_without_variable: variable "-= (T_MINUS_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14418,8 +14418,8 @@ state 423
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -14448,13 +14448,13 @@ state 423
     $default  reduce using rule 260 (expr_without_variable)
 
 
-state 424
+State 424
 
   259 expr_without_variable: variable "+= (T_PLUS_EQUAL)" expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14476,8 +14476,8 @@ state 424
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -14506,9 +14506,9 @@ state 424
     $default  reduce using rule 259 (expr_without_variable)
 
 
-state 425
+State 425
 
-  358 function_call: variable_without_objects '(' @62 . function_call_parameter_list ')'
+  358 function_call: variable_without_objects '(' $@62 . function_call_parameter_list ')'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -14592,7 +14592,7 @@ state 425
     class_constant                          go to state 115
 
 
-state 426
+State 426
 
   470 variable_name: "identifier (T_STRING)" .
   515 class_constant: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" "identifier (T_STRING)" .
@@ -14601,9 +14601,9 @@ state 426
     $default  reduce using rule 515 (class_constant)
 
 
-state 427
+State 427
 
-  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects . '(' @61 function_call_parameter_list ')'
+  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects . '(' $@61 function_call_parameter_list ')'
   446 static_member: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects .
 
     '('  shift, and go to state 537
@@ -14611,19 +14611,19 @@ state 427
     $default  reduce using rule 446 (static_member)
 
 
-state 428
+State 428
 
-  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name . '(' @60 function_call_parameter_list ')'
+  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name . '(' $@60 function_call_parameter_list ')'
 
     '('  shift, and go to state 538
 
 
-state 429
+State 429
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14645,8 +14645,8 @@ state 429
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   463 dim_offset: expr .
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -14679,16 +14679,16 @@ state 429
     $default  reduce using rule 463 (dim_offset)
 
 
-state 430
+State 430
 
   448 array_function_dereference: array_function_dereference '[' dim_offset . ']'
 
     ']'  shift, and go to state 539
 
 
-state 431
+State 431
 
-  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" @65 . object_property @66 method_or_not variable_properties
+  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" $@65 . object_property $@66 method_or_not variable_properties
 
     "identifier (T_STRING)"  shift, and go to state 436
     "variable (T_VARIABLE)"  shift, and go to state 34
@@ -14704,19 +14704,19 @@ state 431
     simple_indirect_reference  go to state 384
 
 
-state 432
+State 432
 
   457 reference_variable: reference_variable '[' dim_offset . ']'
 
     ']'  shift, and go to state 544
 
 
-state 433
+State 433
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14738,8 +14738,8 @@ state 433
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   458 reference_variable: reference_variable '{' expr . '}'
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -14771,17 +14771,17 @@ state 433
     '}'                           shift, and go to state 545
 
 
-state 434
+State 434
 
   508 internal_functions_in_yacc: "eval (T_EVAL)" '(' expr ')' .
 
     $default  reduce using rule 508 (internal_functions_in_yacc)
 
 
-state 435
+State 435
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
-  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name . '(' @56 function_call_parameter_list ')'
+  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name . '(' $@56 function_call_parameter_list ')'
   361 class_name: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name .
 
     "\\ (T_NS_SEPARATOR)"  shift, and go to state 225
@@ -14790,14 +14790,14 @@ state 435
     $default  reduce using rule 361 (class_name)
 
 
-state 436
+State 436
 
   470 variable_name: "identifier (T_STRING)" .
 
     $default  reduce using rule 470 (variable_name)
 
 
-state 437
+State 437
 
   488 non_empty_array_pair_list: expr "=> (T_DOUBLE_ARROW)" '&' . w_variable
 
@@ -14824,12 +14824,12 @@ state 437
     simple_indirect_reference          go to state 113
 
 
-state 438
+State 438
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14851,8 +14851,8 @@ state 438
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   484 non_empty_array_pair_list: expr "=> (T_DOUBLE_ARROW)" expr .
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -14885,7 +14885,7 @@ state 438
     $default  reduce using rule 484 (non_empty_array_pair_list)
 
 
-state 439
+State 439
 
   487 non_empty_array_pair_list: non_empty_array_pair_list ',' '&' . w_variable
 
@@ -14912,12 +14912,12 @@ state 439
     simple_indirect_reference          go to state 113
 
 
-state 440
+State 440
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -14939,8 +14939,8 @@ state 440
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   482 non_empty_array_pair_list: non_empty_array_pair_list ',' expr . "=> (T_DOUBLE_ARROW)" expr
   483                          | non_empty_array_pair_list ',' expr .
   486                          | non_empty_array_pair_list ',' expr . "=> (T_DOUBLE_ARROW)" '&' w_variable
@@ -14976,7 +14976,7 @@ state 440
     $default  reduce using rule 483 (non_empty_array_pair_list)
 
 
-state 441
+State 441
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
   361 class_name: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name .
@@ -14986,14 +14986,14 @@ state 441
     $default  reduce using rule 361 (class_name)
 
 
-state 442
+State 442
 
   445 static_member: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects .
 
     $default  reduce using rule 445 (static_member)
 
 
-state 443
+State 443
 
   382 ctor_arguments: '(' . function_call_parameter_list ')'
 
@@ -15079,23 +15079,23 @@ state 443
     class_constant                          go to state 115
 
 
-state 444
+State 444
 
-  251 new_expr: "new (T_NEW)" class_name_reference @41 ctor_arguments .
+  251 new_expr: "new (T_NEW)" class_name_reference $@41 ctor_arguments .
 
     $default  reduce using rule 251 (new_expr)
 
 
-state 445
+State 445
 
   446 static_member: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects .
 
     $default  reduce using rule 446 (static_member)
 
 
-state 446
+State 446
 
-  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" @63 . object_property @64 dynamic_class_name_variable_properties
+  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" $@63 . object_property $@64 dynamic_class_name_variable_properties
 
     "identifier (T_STRING)"  shift, and go to state 436
     "variable (T_VARIABLE)"  shift, and go to state 34
@@ -15111,32 +15111,32 @@ state 446
     simple_indirect_reference  go to state 384
 
 
-state 447
+State 447
 
   377 exit_expr: '(' expr ')' .
 
     $default  reduce using rule 377 (exit_expr)
 
 
-state 448
+State 448
 
-   38 unticked_statement: "if (T_IF)" '(' expr ')' . @5 statement @6 elseif_list else_single
-   41                   | "if (T_IF)" '(' expr ')' . ':' @7 inner_statement_list @8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
+   38 unticked_statement: "if (T_IF)" '(' expr ')' . $@5 statement $@6 elseif_list else_single
+   41                   | "if (T_IF)" '(' expr ')' . ':' $@7 inner_statement_list $@8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
 
     ':'  shift, and go to state 551
 
-    $default  reduce using rule 36 (@5)
+    $default  reduce using rule 36 ($@5)
 
-    @5  go to state 552
+    $@5  go to state 552
 
 
-state 449
+State 449
 
   232 echo_expr_list: echo_expr_list ',' expr .
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -15158,8 +15158,8 @@ state 449
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -15191,20 +15191,20 @@ state 449
     $default  reduce using rule 232 (echo_expr_list)
 
 
-state 450
+State 450
 
-   47 unticked_statement: "do (T_DO)" @11 statement "while (T_WHILE)" . '(' @12 expr ')' ';'
+   47 unticked_statement: "do (T_DO)" $@11 statement "while (T_WHILE)" . '(' $@12 expr ')' ';'
 
     '('  shift, and go to state 553
 
 
-state 451
+State 451
 
-   44 unticked_statement: "while (T_WHILE)" '(' @9 expr . ')' @10 while_statement
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+   44 unticked_statement: "while (T_WHILE)" '(' $@9 expr . ')' $@10 while_statement
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -15226,8 +15226,8 @@ state 451
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -15258,68 +15258,68 @@ state 451
     ')'                           shift, and go to state 554
 
 
-state 452
+State 452
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' . @13 for_expr ';' @14 for_expr ')' @15 for_statement
+   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' . $@13 for_expr ';' $@14 for_expr ')' $@15 for_statement
 
-    $default  reduce using rule 48 (@13)
+    $default  reduce using rule 48 ($@13)
 
-    @13  go to state 555
+    $@13  go to state 555
 
 
-state 453
+State 453
 
-  237 non_empty_for_expr: non_empty_for_expr ',' . @38 expr
+  237 non_empty_for_expr: non_empty_for_expr ',' . $@38 expr
 
-    $default  reduce using rule 236 (@38)
+    $default  reduce using rule 236 ($@38)
 
-    @38  go to state 556
+    $@38  go to state 556
 
 
-state 454
+State 454
 
-   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" . @19 variable foreach_optional_arg ')' @20 foreach_statement
+   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" . $@19 variable foreach_optional_arg ')' $@20 foreach_statement
 
-    $default  reduce using rule 70 (@19)
+    $default  reduce using rule 70 ($@19)
 
-    @19  go to state 557
+    $@19  go to state 557
 
 
-state 455
+State 455
 
-   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" . @17 foreach_variable foreach_optional_arg ')' @18 foreach_statement
+   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" . $@17 foreach_variable foreach_optional_arg ')' $@18 foreach_statement
 
-    $default  reduce using rule 67 (@17)
+    $default  reduce using rule 67 ($@17)
 
-    @17  go to state 558
+    $@17  go to state 558
 
 
-state 456
+State 456
 
   127 declare_list: "identifier (T_STRING)" . '=' static_scalar
 
     '='  shift, and go to state 559
 
 
-state 457
+State 457
 
-   74 unticked_statement: "declare (T_DECLARE)" @21 '(' declare_list . ')' declare_statement
+   74 unticked_statement: "declare (T_DECLARE)" $@21 '(' declare_list . ')' declare_statement
   128 declare_list: declare_list . ',' "identifier (T_STRING)" '=' static_scalar
 
     ','  shift, and go to state 560
     ')'  shift, and go to state 561
 
 
-state 458
+State 458
 
-   53 unticked_statement: "switch (T_SWITCH)" '(' expr ')' . @16 switch_case_list
+   53 unticked_statement: "switch (T_SWITCH)" '(' expr ')' . $@16 switch_case_list
 
-    $default  reduce using rule 52 (@16)
+    $default  reduce using rule 52 ($@16)
 
-    @16  go to state 562
+    $@16  go to state 562
 
 
-state 459
+State 459
 
   399 static_scalar: '+' . static_scalar
 
@@ -15351,7 +15351,7 @@ state 459
     static_class_constant  go to state 471
 
 
-state 460
+State 460
 
   400 static_scalar: '-' . static_scalar
 
@@ -15383,7 +15383,7 @@ state 460
     static_class_constant  go to state 471
 
 
-state 461
+State 461
 
   402 static_scalar: '[' . static_array_pair_list ']'
 
@@ -15419,21 +15419,21 @@ state 461
     non_empty_static_array_pair_list  go to state 567
 
 
-state 462
+State 462
 
   401 static_scalar: "array (T_ARRAY)" . '(' static_array_pair_list ')'
 
     '('  shift, and go to state 568
 
 
-state 463
+State 463
 
   404 static_scalar: "__CLASS__ (T_CLASS_C)" .
 
     $default  reduce using rule 404 (static_scalar)
 
 
-state 464
+State 464
 
   393 common_scalar: "heredoc start (T_START_HEREDOC)" . "quoted-string and whitespace (T_ENCAPSED_AND_WHITESPACE)" "heredoc end (T_END_HEREDOC)"
   394              | "heredoc start (T_START_HEREDOC)" . "heredoc end (T_END_HEREDOC)"
@@ -15442,7 +15442,7 @@ state 464
     "heredoc end (T_END_HEREDOC)"                               shift, and go to state 207
 
 
-state 465
+State 465
 
   361 class_name: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name
   397 static_scalar: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name
@@ -15450,7 +15450,7 @@ state 465
     "\\ (T_NS_SEPARATOR)"  shift, and go to state 570
 
 
-state 466
+State 466
 
   362 class_name: "\\ (T_NS_SEPARATOR)" . namespace_name
   398 static_scalar: "\\ (T_NS_SEPARATOR)" . namespace_name
@@ -15460,7 +15460,7 @@ state 466
     namespace_name  go to state 571
 
 
-state 467
+State 467
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
   360 class_name: namespace_name .
@@ -15472,74 +15472,74 @@ state 467
     $default                       reduce using rule 396 (static_scalar)
 
 
-state 468
+State 468
 
   405 static_class_constant: class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" "identifier (T_STRING)"
 
     ":: (T_PAAMAYIM_NEKUDOTAYIM)"  shift, and go to state 572
 
 
-state 469
+State 469
 
   395 static_scalar: common_scalar .
 
     $default  reduce using rule 395 (static_scalar)
 
 
-state 470
+State 470
 
    25 constant_declaration: "const (T_CONST)" "identifier (T_STRING)" '=' static_scalar .
 
     $default  reduce using rule 25 (constant_declaration)
 
 
-state 471
+State 471
 
   403 static_scalar: static_class_constant .
 
     $default  reduce using rule 403 (static_scalar)
 
 
-state 472
+State 472
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list . '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list . '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
     '}'  shift, and go to state 573
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
-state 473
+State 473
 
    23 use_declaration: "\\ (T_NS_SEPARATOR)" namespace_name "as (T_AS)" . "identifier (T_STRING)"
 
     "identifier (T_STRING)"  shift, and go to state 574
 
 
-state 474
+State 474
 
    21 use_declaration: namespace_name "as (T_AS)" "identifier (T_STRING)" .
 
     $default  reduce using rule 21 (use_declaration)
 
 
-state 475
+State 475
 
    18 use_declarations: use_declarations ',' use_declaration .
 
     $default  reduce using rule 18 (use_declarations)
 
 
-state 476
+State 476
 
   178 global_var: '$' '{' expr . '}'
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -15561,8 +15561,8 @@ state 476
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -15593,21 +15593,21 @@ state 476
     '}'                           shift, and go to state 575
 
 
-state 477
+State 477
 
   174 global_var_list: global_var_list ',' global_var .
 
     $default  reduce using rule 174 (global_var_list)
 
 
-state 478
+State 478
 
   182 static_var_list: "variable (T_VARIABLE)" '=' static_scalar .
 
     $default  reduce using rule 182 (static_var_list)
 
 
-state 479
+State 479
 
   179 static_var_list: static_var_list ',' "variable (T_VARIABLE)" .
   180                | static_var_list ',' "variable (T_VARIABLE)" . '=' static_scalar
@@ -15617,7 +15617,7 @@ state 479
     $default  reduce using rule 179 (static_var_list)
 
 
-state 480
+State 480
 
   335 expr_without_variable: "static (T_STATIC)" function is_reference '(' . @54 parameter_list ')' lexical_vars '{' inner_statement_list '}'
 
@@ -15626,7 +15626,7 @@ state 480
     @54  go to state 577
 
 
-state 481
+State 481
 
    92 unset_variables: unset_variables ',' . unset_variable
 
@@ -15653,83 +15653,83 @@ state 481
     simple_indirect_reference          go to state 113
 
 
-state 482
+State 482
 
    66 unticked_statement: "unset (T_UNSET)" '(' unset_variables ')' . ';'
 
     ';'  shift, and go to state 579
 
 
-state 483
+State 483
 
-  513 isset_variables: isset_variables ',' . @73 variable
+  513 isset_variables: isset_variables ',' . $@73 variable
 
-    $default  reduce using rule 512 (@73)
+    $default  reduce using rule 512 ($@73)
 
-    @73  go to state 580
+    $@73  go to state 580
 
 
-state 484
+State 484
 
   504 internal_functions_in_yacc: "isset (T_ISSET)" '(' isset_variables ')' .
 
     $default  reduce using rule 504 (internal_functions_in_yacc)
 
 
-state 485
+State 485
 
   505 internal_functions_in_yacc: "empty (T_EMPTY)" '(' variable ')' .
 
     $default  reduce using rule 505 (internal_functions_in_yacc)
 
 
-state 486
+State 486
 
    10 top_statement: "__halt_compiler (T_HALT_COMPILER)" '(' ')' ';' .
 
     $default  reduce using rule 10 (top_statement)
 
 
-state 487
+State 487
 
-  478 assignment_list_element: "list (T_LIST)" . '(' @71 assignment_list ')'
+  478 assignment_list_element: "list (T_LIST)" . '(' $@71 assignment_list ')'
 
     '('  shift, and go to state 581
 
 
-state 488
+State 488
 
   476 assignment_list_element: variable .
 
     $default  reduce using rule 476 (assignment_list_element)
 
 
-state 489
+State 489
 
-  253 expr_without_variable: "list (T_LIST)" '(' @42 assignment_list . ')' '=' expr
+  253 expr_without_variable: "list (T_LIST)" '(' $@42 assignment_list . ')' '=' expr
   474 assignment_list: assignment_list . ',' assignment_list_element
 
     ','  shift, and go to state 582
     ')'  shift, and go to state 583
 
 
-state 490
+State 490
 
   475 assignment_list: assignment_list_element .
 
     $default  reduce using rule 475 (assignment_list)
 
 
-state 491
+State 491
 
   328 expr_without_variable: "array (T_ARRAY)" '(' array_pair_list ')' .
 
     $default  reduce using rule 328 (expr_without_variable)
 
 
-state 492
+State 492
 
-  496 encaps_var: "variable (T_VARIABLE)" '[' @72 . encaps_var_offset ']'
+  496 encaps_var: "variable (T_VARIABLE)" '[' $@72 . encaps_var_offset ']'
 
     "identifier (T_STRING)"  shift, and go to state 584
     "variable (T_VARIABLE)"  shift, and go to state 585
@@ -15738,14 +15738,14 @@ state 492
     encaps_var_offset  go to state 587
 
 
-state 493
+State 493
 
   497 encaps_var: "variable (T_VARIABLE)" "-> (T_OBJECT_OPERATOR)" "identifier (T_STRING)" .
 
     $default  reduce using rule 497 (encaps_var)
 
 
-state 494
+State 494
 
   499 encaps_var: "${ (T_DOLLAR_OPEN_CURLY_BRACES)" "variable name (T_STRING_VARNAME)" '[' . expr ']' '}'
 
@@ -15826,53 +15826,53 @@ state 494
     class_constant                     go to state 115
 
 
-state 495
+State 495
 
   498 encaps_var: "${ (T_DOLLAR_OPEN_CURLY_BRACES)" expr '}' .
 
     $default  reduce using rule 498 (encaps_var)
 
 
-state 496
+State 496
 
   500 encaps_var: "{$ (T_CURLY_OPEN)" variable '}' .
 
     $default  reduce using rule 500 (encaps_var)
 
 
-state 497
+State 497
 
-  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name '(' . @56 function_call_parameter_list ')'
+  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name '(' . $@56 function_call_parameter_list ')'
 
-    $default  reduce using rule 345 (@56)
+    $default  reduce using rule 345 ($@56)
 
-    @56  go to state 589
+    $@56  go to state 589
 
 
-state 498
+State 498
 
-    3 top_statement_list: top_statement_list . @1 top_statement
-   15 top_statement: "namespace (T_NAMESPACE)" '{' @3 top_statement_list . '}'
+    3 top_statement_list: top_statement_list . $@1 top_statement
+   15 top_statement: "namespace (T_NAMESPACE)" '{' $@3 top_statement_list . '}'
 
     '}'  shift, and go to state 590
 
-    $default  reduce using rule 2 (@1)
+    $default  reduce using rule 2 ($@1)
 
-    @1  go to state 4
+    $@1  go to state 4
 
 
-state 499
+State 499
 
-   13 top_statement: "namespace (T_NAMESPACE)" namespace_name '{' @2 . top_statement_list '}'
+   13 top_statement: "namespace (T_NAMESPACE)" namespace_name '{' $@2 . top_statement_list '}'
 
     $default  reduce using rule 4 (top_statement_list)
 
     top_statement_list  go to state 591
 
 
-state 500
+State 500
 
-  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name '(' @57 . function_call_parameter_list ')'
+  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name '(' $@57 . function_call_parameter_list ')'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -15956,61 +15956,61 @@ state 500
     class_constant                          go to state 115
 
 
-state 501
+State 501
 
   310 expr_without_variable: '(' new_expr ')' @48 . instance_call
 
-    '['                       reduce using rule 248 (@40)
-    "-> (T_OBJECT_OPERATOR)"  reduce using rule 248 (@40)
+    '['                       reduce using rule 248 ($@40)
+    "-> (T_OBJECT_OPERATOR)"  reduce using rule 248 ($@40)
     $default                  reduce using rule 247 (instance_call)
 
     instance_call  go to state 593
-    @40            go to state 594
+    $@40           go to state 594
 
 
-state 502
+State 502
 
    32 inner_statement: "__halt_compiler (T_HALT_COMPILER)" . '(' ')' ';'
 
     '('  shift, and go to state 595
 
 
-state 503
+State 503
 
-   27 inner_statement_list: inner_statement_list @4 inner_statement .
+   27 inner_statement_list: inner_statement_list $@4 inner_statement .
 
     $default  reduce using rule 27 (inner_statement_list)
 
 
-state 504
+State 504
 
    29 inner_statement: statement .
 
     $default  reduce using rule 29 (inner_statement)
 
 
-state 505
+State 505
 
    30 inner_statement: function_declaration_statement .
 
     $default  reduce using rule 30 (inner_statement)
 
 
-state 506
+State 506
 
    31 inner_statement: class_declaration_statement .
 
     $default  reduce using rule 31 (inner_statement)
 
 
-state 507
+State 507
 
   461 compound_variable: '$' '{' expr '}' .
 
     $default  reduce using rule 461 (compound_variable)
 
 
-state 508
+State 508
 
   170 non_empty_function_call_parameter_list: '&' . w_variable
 
@@ -16037,14 +16037,14 @@ state 508
     simple_indirect_reference          go to state 113
 
 
-state 509
+State 509
 
-  344 function_call: namespace_name '(' @55 function_call_parameter_list . ')'
+  344 function_call: namespace_name '(' $@55 function_call_parameter_list . ')'
 
     ')'  shift, and go to state 597
 
 
-state 510
+State 510
 
   166 function_call_parameter_list: non_empty_function_call_parameter_list .
   171 non_empty_function_call_parameter_list: non_empty_function_call_parameter_list . ',' expr_without_variable
@@ -16056,7 +16056,7 @@ state 510
     $default  reduce using rule 166 (function_call_parameter_list)
 
 
-state 511
+State 511
 
   168 non_empty_function_call_parameter_list: expr_without_variable .
   424 expr: expr_without_variable .
@@ -16066,12 +16066,12 @@ state 511
     $default  reduce using rule 424 (expr)
 
 
-state 512
+State 512
 
   169 non_empty_function_call_parameter_list: variable .
   254 expr_without_variable: variable . '=' expr
   255                      | variable . '=' '&' variable
-  257                      | variable . '=' '&' "new (T_NEW)" class_name_reference @43 ctor_arguments
+  257                      | variable . '=' '&' "new (T_NEW)" class_name_reference $@43 ctor_arguments
   259                      | variable . "+= (T_PLUS_EQUAL)" expr
   260                      | variable . "-= (T_MINUS_EQUAL)" expr
   261                      | variable . "*= (T_MUL_EQUAL)" expr
@@ -16106,7 +16106,7 @@ state 512
     $default      reduce using rule 425 (r_variable)
 
 
-state 513
+State 513
 
    24 constant_declaration: constant_declaration ',' "identifier (T_STRING)" '=' . static_scalar
 
@@ -16138,14 +16138,14 @@ state 513
     static_class_constant  go to state 471
 
 
-state 514
+State 514
 
   364 fully_qualified_class_name: "namespace (T_NAMESPACE)" . "\\ (T_NS_SEPARATOR)" namespace_name
 
     "\\ (T_NS_SEPARATOR)"  shift, and go to state 600
 
 
-state 515
+State 515
 
   365 fully_qualified_class_name: "\\ (T_NS_SEPARATOR)" . namespace_name
 
@@ -16154,7 +16154,7 @@ state 515
     namespace_name  go to state 601
 
 
-state 516
+State 516
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
   363 fully_qualified_class_name: namespace_name .
@@ -16164,16 +16164,16 @@ state 516
     $default  reduce using rule 363 (fully_qualified_class_name)
 
 
-state 517
+State 517
 
   109 extends_from: "extends (T_EXTENDS)" fully_qualified_class_name .
 
     $default  reduce using rule 109 (extends_from)
 
 
-state 518
+State 518
 
-  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from @30 . implements_list '{' class_statement_list '}'
+  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from $@30 . implements_list '{' class_statement_list '}'
 
     "implements (T_IMPLEMENTS)"  shift, and go to state 602
 
@@ -16182,7 +16182,7 @@ state 518
     implements_list  go to state 603
 
 
-state 519
+State 519
 
   112 interface_extends_list: "extends (T_EXTENDS)" . interface_list
 
@@ -16195,21 +16195,21 @@ state 519
     fully_qualified_class_name  go to state 605
 
 
-state 520
+State 520
 
-  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" @31 interface_extends_list . '{' class_statement_list '}'
+  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" $@31 interface_extends_list . '{' class_statement_list '}'
 
     '{'  shift, and go to state 606
 
 
-state 521
+State 521
 
-   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" @29 . '(' parameter_list ')' '{' inner_statement_list '}'
+   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" $@29 . '(' parameter_list ')' '{' inner_statement_list '}'
 
     '('  shift, and go to state 607
 
 
-state 522
+State 522
 
   333 expr_without_variable: function is_reference '(' @53 . parameter_list ')' lexical_vars '{' inner_statement_list '}'
 
@@ -16229,19 +16229,19 @@ state 522
     fully_qualified_class_name  go to state 613
 
 
-state 523
+State 523
 
-  450 array_function_dereference: function_call @69 '[' dim_offset . ']'
+  450 array_function_dereference: function_call $@69 '[' dim_offset . ']'
 
     ']'  shift, and go to state 614
 
 
-state 524
+State 524
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -16263,8 +16263,8 @@ state 524
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   471 variable_name: '{' expr . '}'
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -16296,25 +16296,25 @@ state 524
     '}'                           shift, and go to state 615
 
 
-state 525
+State 525
 
-  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' . @59 function_call_parameter_list ')'
+  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' . $@59 function_call_parameter_list ')'
 
-    $default  reduce using rule 351 (@59)
+    $default  reduce using rule 351 ($@59)
 
-    @59  go to state 616
+    $@59  go to state 616
 
 
-state 526
+State 526
 
-  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' . @58 function_call_parameter_list ')'
+  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' . $@58 function_call_parameter_list ')'
 
-    $default  reduce using rule 349 (@58)
+    $default  reduce using rule 349 ($@58)
 
-    @58  go to state 617
+    $@58  go to state 617
 
 
-state 527
+State 527
 
   444 variable_without_objects: simple_indirect_reference reference_variable .
   457 reference_variable: reference_variable . '[' dim_offset ']'
@@ -16326,13 +16326,13 @@ state 527
     $default  reduce using rule 444 (variable_without_objects)
 
 
-state 528
+State 528
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  279                      | expr "or (T_LOGICAL_OR)" @46 expr .
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  279                      | expr "or (T_LOGICAL_OR)" $@46 expr .
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -16354,8 +16354,8 @@ state 528
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
     "and (T_LOGICAL_AND)"         shift, and go to state 237
@@ -16386,13 +16386,13 @@ state 528
     $default  reduce using rule 279 (expr_without_variable)
 
 
-state 529
+State 529
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
-  281                      | expr "and (T_LOGICAL_AND)" @47 expr .
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
+  281                      | expr "and (T_LOGICAL_AND)" $@47 expr .
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -16414,8 +16414,8 @@ state 529
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -16444,9 +16444,9 @@ state 529
     $default  reduce using rule 281 (expr_without_variable)
 
 
-state 530
+State 530
 
-  315 expr_without_variable: expr '?' ':' @51 . expr
+  315 expr_without_variable: expr '?' ':' $@51 . expr
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -16525,12 +16525,12 @@ state 530
     class_constant                     go to state 115
 
 
-state 531
+State 531
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -16552,9 +16552,9 @@ state 531
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  313                      | expr '?' @49 expr . ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  313                      | expr '?' $@49 expr . ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -16585,13 +16585,13 @@ state 531
     "instanceof (T_INSTANCEOF)"   shift, and go to state 260
 
 
-state 532
+State 532
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  275                      | expr "|| (T_BOOLEAN_OR)" @44 expr .
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  275                      | expr "|| (T_BOOLEAN_OR)" $@44 expr .
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -16613,8 +16613,8 @@ state 532
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "&& (T_BOOLEAN_AND)"          shift, and go to state 240
     '|'                           shift, and go to state 241
@@ -16641,13 +16641,13 @@ state 532
     $default  reduce using rule 275 (expr_without_variable)
 
 
-state 533
+State 533
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  277                      | expr "&& (T_BOOLEAN_AND)" @45 expr .
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  277                      | expr "&& (T_BOOLEAN_AND)" $@45 expr .
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -16669,8 +16669,8 @@ state 533
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '|'                           shift, and go to state 241
     '^'                           shift, and go to state 242
@@ -16696,9 +16696,9 @@ state 533
     $default  reduce using rule 277 (expr_without_variable)
 
 
-state 534
+State 534
 
-  257 expr_without_variable: variable '=' '&' "new (T_NEW)" . class_name_reference @43 ctor_arguments
+  257 expr_without_variable: variable '=' '&' "new (T_NEW)" . class_name_reference $@43 ctor_arguments
 
     "identifier (T_STRING)"    shift, and go to state 116
     "variable (T_VARIABLE)"    shift, and go to state 34
@@ -16719,64 +16719,64 @@ state 534
     simple_indirect_reference     go to state 161
 
 
-state 535
+State 535
 
   255 expr_without_variable: variable '=' '&' variable .
 
     $default  reduce using rule 255 (expr_without_variable)
 
 
-state 536
+State 536
 
-  358 function_call: variable_without_objects '(' @62 function_call_parameter_list . ')'
+  358 function_call: variable_without_objects '(' $@62 function_call_parameter_list . ')'
 
     ')'  shift, and go to state 621
 
 
-state 537
+State 537
 
-  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' . @61 function_call_parameter_list ')'
+  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' . $@61 function_call_parameter_list ')'
 
-    $default  reduce using rule 355 (@61)
+    $default  reduce using rule 355 ($@61)
 
-    @61  go to state 622
+    $@61  go to state 622
 
 
-state 538
+State 538
 
-  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' . @60 function_call_parameter_list ')'
+  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' . $@60 function_call_parameter_list ')'
 
-    $default  reduce using rule 353 (@60)
+    $default  reduce using rule 353 ($@60)
 
-    @60  go to state 623
+    $@60  go to state 623
 
 
-state 539
+State 539
 
   448 array_function_dereference: array_function_dereference '[' dim_offset ']' .
 
     $default  reduce using rule 448 (array_function_dereference)
 
 
-state 540
+State 540
 
-  466 object_property: variable_without_objects . @70
+  466 object_property: variable_without_objects . $@70
 
-    $default  reduce using rule 465 (@70)
+    $default  reduce using rule 465 ($@70)
 
-    @70  go to state 624
+    $@70  go to state 624
 
 
-state 541
+State 541
 
-  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" @65 object_property . @66 method_or_not variable_properties
+  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" $@65 object_property . $@66 method_or_not variable_properties
 
-    $default  reduce using rule 429 (@66)
+    $default  reduce using rule 429 ($@66)
 
-    @66  go to state 625
+    $@66  go to state 625
 
 
-state 542
+State 542
 
   464 object_property: object_dim_list .
   467 object_dim_list: object_dim_list . '[' dim_offset ']'
@@ -16788,42 +16788,42 @@ state 542
     $default  reduce using rule 464 (object_property)
 
 
-state 543
+State 543
 
   469 object_dim_list: variable_name .
 
     $default  reduce using rule 469 (object_dim_list)
 
 
-state 544
+State 544
 
   457 reference_variable: reference_variable '[' dim_offset ']' .
 
     $default  reduce using rule 457 (reference_variable)
 
 
-state 545
+State 545
 
   458 reference_variable: reference_variable '{' expr '}' .
 
     $default  reduce using rule 458 (reference_variable)
 
 
-state 546
+State 546
 
   488 non_empty_array_pair_list: expr "=> (T_DOUBLE_ARROW)" '&' w_variable .
 
     $default  reduce using rule 488 (non_empty_array_pair_list)
 
 
-state 547
+State 547
 
   487 non_empty_array_pair_list: non_empty_array_pair_list ',' '&' w_variable .
 
     $default  reduce using rule 487 (non_empty_array_pair_list)
 
 
-state 548
+State 548
 
   482 non_empty_array_pair_list: non_empty_array_pair_list ',' expr "=> (T_DOUBLE_ARROW)" . expr
   486                          | non_empty_array_pair_list ',' expr "=> (T_DOUBLE_ARROW)" . '&' w_variable
@@ -16906,34 +16906,34 @@ state 548
     class_constant                     go to state 115
 
 
-state 549
+State 549
 
   382 ctor_arguments: '(' function_call_parameter_list . ')'
 
     ')'  shift, and go to state 630
 
 
-state 550
+State 550
 
-  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" @63 object_property . @64 dynamic_class_name_variable_properties
+  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" $@63 object_property . $@64 dynamic_class_name_variable_properties
 
-    $default  reduce using rule 369 (@64)
+    $default  reduce using rule 369 ($@64)
 
-    @64  go to state 631
+    $@64  go to state 631
 
 
-state 551
+State 551
 
-   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' . @7 inner_statement_list @8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
+   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' . $@7 inner_statement_list $@8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
 
-    $default  reduce using rule 39 (@7)
+    $default  reduce using rule 39 ($@7)
 
-    @7  go to state 632
+    $@7  go to state 632
 
 
-state 552
+State 552
 
-   38 unticked_statement: "if (T_IF)" '(' expr ')' @5 . statement @6 elseif_list else_single
+   38 unticked_statement: "if (T_IF)" '(' expr ')' $@5 . statement $@6 elseif_list else_single
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -17033,27 +17033,27 @@ state 552
     class_constant                     go to state 115
 
 
-state 553
+State 553
 
-   47 unticked_statement: "do (T_DO)" @11 statement "while (T_WHILE)" '(' . @12 expr ')' ';'
+   47 unticked_statement: "do (T_DO)" $@11 statement "while (T_WHILE)" '(' . $@12 expr ')' ';'
 
-    $default  reduce using rule 46 (@12)
+    $default  reduce using rule 46 ($@12)
 
-    @12  go to state 634
+    $@12  go to state 634
 
 
-state 554
+State 554
 
-   44 unticked_statement: "while (T_WHILE)" '(' @9 expr ')' . @10 while_statement
+   44 unticked_statement: "while (T_WHILE)" '(' $@9 expr ')' . $@10 while_statement
 
-    $default  reduce using rule 43 (@10)
+    $default  reduce using rule 43 ($@10)
 
-    @10  go to state 635
+    $@10  go to state 635
 
 
-state 555
+State 555
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' @13 . for_expr ';' @14 for_expr ')' @15 for_statement
+   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' $@13 . for_expr ';' $@14 for_expr ')' $@15 for_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -17136,9 +17136,9 @@ state 555
     class_constant                     go to state 115
 
 
-state 556
+State 556
 
-  237 non_empty_for_expr: non_empty_for_expr ',' @38 . expr
+  237 non_empty_for_expr: non_empty_for_expr ',' $@38 . expr
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -17217,9 +17217,9 @@ state 556
     class_constant                     go to state 115
 
 
-state 557
+State 557
 
-   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" @19 . variable foreach_optional_arg ')' @20 foreach_statement
+   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" $@19 . variable foreach_optional_arg ')' $@20 foreach_statement
 
     "identifier (T_STRING)"    shift, and go to state 116
     "variable (T_VARIABLE)"    shift, and go to state 34
@@ -17243,9 +17243,9 @@ state 557
     simple_indirect_reference          go to state 113
 
 
-state 558
+State 558
 
-   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" @17 . foreach_variable foreach_optional_arg ')' @18 foreach_statement
+   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" $@17 . foreach_variable foreach_optional_arg ')' $@18 foreach_statement
 
     '&'                        shift, and go to state 639
     "identifier (T_STRING)"    shift, and go to state 116
@@ -17271,7 +17271,7 @@ state 558
     simple_indirect_reference          go to state 113
 
 
-state 559
+State 559
 
   127 declare_list: "identifier (T_STRING)" '=' . static_scalar
 
@@ -17303,16 +17303,16 @@ state 559
     static_class_constant  go to state 471
 
 
-state 560
+State 560
 
   128 declare_list: declare_list ',' . "identifier (T_STRING)" '=' static_scalar
 
     "identifier (T_STRING)"  shift, and go to state 643
 
 
-state 561
+State 561
 
-   74 unticked_statement: "declare (T_DECLARE)" @21 '(' declare_list ')' . declare_statement
+   74 unticked_statement: "declare (T_DECLARE)" $@21 '(' declare_list ')' . declare_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -17414,9 +17414,9 @@ state 561
     class_constant                     go to state 115
 
 
-state 562
+State 562
 
-   53 unticked_statement: "switch (T_SWITCH)" '(' expr ')' @16 . switch_case_list
+   53 unticked_statement: "switch (T_SWITCH)" '(' expr ')' $@16 . switch_case_list
 
     ':'  shift, and go to state 647
     '{'  shift, and go to state 648
@@ -17424,21 +17424,21 @@ state 562
     switch_case_list  go to state 649
 
 
-state 563
+State 563
 
   399 static_scalar: '+' static_scalar .
 
     $default  reduce using rule 399 (static_scalar)
 
 
-state 564
+State 564
 
   400 static_scalar: '-' static_scalar .
 
     $default  reduce using rule 400 (static_scalar)
 
 
-state 565
+State 565
 
   421 non_empty_static_array_pair_list: static_scalar . "=> (T_DOUBLE_ARROW)" static_scalar
   422                                 | static_scalar .
@@ -17448,14 +17448,14 @@ state 565
     $default  reduce using rule 422 (non_empty_static_array_pair_list)
 
 
-state 566
+State 566
 
   402 static_scalar: '[' static_array_pair_list . ']'
 
     ']'  shift, and go to state 651
 
 
-state 567
+State 567
 
   416 static_array_pair_list: non_empty_static_array_pair_list . possible_comma
   419 non_empty_static_array_pair_list: non_empty_static_array_pair_list . ',' static_scalar "=> (T_DOUBLE_ARROW)" static_scalar
@@ -17468,7 +17468,7 @@ state 567
     possible_comma  go to state 653
 
 
-state 568
+State 568
 
   401 static_scalar: "array (T_ARRAY)" '(' . static_array_pair_list ')'
 
@@ -17504,14 +17504,14 @@ state 568
     non_empty_static_array_pair_list  go to state 567
 
 
-state 569
+State 569
 
   393 common_scalar: "heredoc start (T_START_HEREDOC)" "quoted-string and whitespace (T_ENCAPSED_AND_WHITESPACE)" . "heredoc end (T_END_HEREDOC)"
 
     "heredoc end (T_END_HEREDOC)"  shift, and go to state 350
 
 
-state 570
+State 570
 
   361 class_name: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" . namespace_name
   397 static_scalar: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" . namespace_name
@@ -17521,7 +17521,7 @@ state 570
     namespace_name  go to state 655
 
 
-state 571
+State 571
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
   362 class_name: "\\ (T_NS_SEPARATOR)" namespace_name .
@@ -17533,35 +17533,35 @@ state 571
     $default                       reduce using rule 398 (static_scalar)
 
 
-state 572
+State 572
 
   405 static_class_constant: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . "identifier (T_STRING)"
 
     "identifier (T_STRING)"  shift, and go to state 656
 
 
-state 573
+State 573
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' . "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' . "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
     "catch (T_CATCH)"  shift, and go to state 657
 
 
-state 574
+State 574
 
    23 use_declaration: "\\ (T_NS_SEPARATOR)" namespace_name "as (T_AS)" "identifier (T_STRING)" .
 
     $default  reduce using rule 23 (use_declaration)
 
 
-state 575
+State 575
 
   178 global_var: '$' '{' expr '}' .
 
     $default  reduce using rule 178 (global_var)
 
 
-state 576
+State 576
 
   180 static_var_list: static_var_list ',' "variable (T_VARIABLE)" '=' . static_scalar
 
@@ -17593,7 +17593,7 @@ state 576
     static_class_constant  go to state 471
 
 
-state 577
+State 577
 
   335 expr_without_variable: "static (T_STATIC)" function is_reference '(' @54 . parameter_list ')' lexical_vars '{' inner_statement_list '}'
 
@@ -17613,23 +17613,23 @@ state 577
     fully_qualified_class_name  go to state 613
 
 
-state 578
+State 578
 
    92 unset_variables: unset_variables ',' unset_variable .
 
     $default  reduce using rule 92 (unset_variables)
 
 
-state 579
+State 579
 
    66 unticked_statement: "unset (T_UNSET)" '(' unset_variables ')' ';' .
 
     $default  reduce using rule 66 (unticked_statement)
 
 
-state 580
+State 580
 
-  513 isset_variables: isset_variables ',' @73 . variable
+  513 isset_variables: isset_variables ',' $@73 . variable
 
     "identifier (T_STRING)"    shift, and go to state 116
     "variable (T_VARIABLE)"    shift, and go to state 34
@@ -17653,16 +17653,16 @@ state 580
     simple_indirect_reference          go to state 113
 
 
-state 581
+State 581
 
-  478 assignment_list_element: "list (T_LIST)" '(' . @71 assignment_list ')'
+  478 assignment_list_element: "list (T_LIST)" '(' . $@71 assignment_list ')'
 
-    $default  reduce using rule 477 (@71)
+    $default  reduce using rule 477 ($@71)
 
-    @71  go to state 661
+    $@71  go to state 661
 
 
-state 582
+State 582
 
   474 assignment_list: assignment_list ',' . assignment_list_element
 
@@ -17692,47 +17692,47 @@ state 582
     assignment_list_element            go to state 662
 
 
-state 583
+State 583
 
-  253 expr_without_variable: "list (T_LIST)" '(' @42 assignment_list ')' . '=' expr
+  253 expr_without_variable: "list (T_LIST)" '(' $@42 assignment_list ')' . '=' expr
 
     '='  shift, and go to state 663
 
 
-state 584
+State 584
 
   501 encaps_var_offset: "identifier (T_STRING)" .
 
     $default  reduce using rule 501 (encaps_var_offset)
 
 
-state 585
+State 585
 
   503 encaps_var_offset: "variable (T_VARIABLE)" .
 
     $default  reduce using rule 503 (encaps_var_offset)
 
 
-state 586
+State 586
 
   502 encaps_var_offset: "number (T_NUM_STRING)" .
 
     $default  reduce using rule 502 (encaps_var_offset)
 
 
-state 587
+State 587
 
-  496 encaps_var: "variable (T_VARIABLE)" '[' @72 encaps_var_offset . ']'
+  496 encaps_var: "variable (T_VARIABLE)" '[' $@72 encaps_var_offset . ']'
 
     ']'  shift, and go to state 664
 
 
-state 588
+State 588
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -17754,8 +17754,8 @@ state 588
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   499 encaps_var: "${ (T_DOLLAR_OPEN_CURLY_BRACES)" "variable name (T_STRING_VARNAME)" '[' expr . ']' '}'
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -17787,9 +17787,9 @@ state 588
     ']'                           shift, and go to state 665
 
 
-state 589
+State 589
 
-  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name '(' @56 . function_call_parameter_list ')'
+  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name '(' $@56 . function_call_parameter_list ')'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -17873,42 +17873,42 @@ state 589
     class_constant                          go to state 115
 
 
-state 590
+State 590
 
-   15 top_statement: "namespace (T_NAMESPACE)" '{' @3 top_statement_list '}' .
+   15 top_statement: "namespace (T_NAMESPACE)" '{' $@3 top_statement_list '}' .
 
     $default  reduce using rule 15 (top_statement)
 
 
-state 591
+State 591
 
-    3 top_statement_list: top_statement_list . @1 top_statement
-   13 top_statement: "namespace (T_NAMESPACE)" namespace_name '{' @2 top_statement_list . '}'
+    3 top_statement_list: top_statement_list . $@1 top_statement
+   13 top_statement: "namespace (T_NAMESPACE)" namespace_name '{' $@2 top_statement_list . '}'
 
     '}'  shift, and go to state 667
 
-    $default  reduce using rule 2 (@1)
+    $default  reduce using rule 2 ($@1)
 
-    @1  go to state 4
+    $@1  go to state 4
 
 
-state 592
+State 592
 
-  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name '(' @57 function_call_parameter_list . ')'
+  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name '(' $@57 function_call_parameter_list . ')'
 
     ')'  shift, and go to state 668
 
 
-state 593
+State 593
 
   310 expr_without_variable: '(' new_expr ')' @48 instance_call .
 
     $default  reduce using rule 310 (expr_without_variable)
 
 
-state 594
+State 594
 
-  249 instance_call: @40 . chaining_instance_call
+  249 instance_call: $@40 . chaining_instance_call
 
     '['                       shift, and go to state 669
     "-> (T_OBJECT_OPERATOR)"  shift, and go to state 670
@@ -17919,28 +17919,28 @@ state 594
     variable_property            go to state 674
 
 
-state 595
+State 595
 
    32 inner_statement: "__halt_compiler (T_HALT_COMPILER)" '(' . ')' ';'
 
     ')'  shift, and go to state 675
 
 
-state 596
+State 596
 
   170 non_empty_function_call_parameter_list: '&' w_variable .
 
     $default  reduce using rule 170 (non_empty_function_call_parameter_list)
 
 
-state 597
+State 597
 
-  344 function_call: namespace_name '(' @55 function_call_parameter_list ')' .
+  344 function_call: namespace_name '(' $@55 function_call_parameter_list ')' .
 
     $default  reduce using rule 344 (function_call)
 
 
-state 598
+State 598
 
   171 non_empty_function_call_parameter_list: non_empty_function_call_parameter_list ',' . expr_without_variable
   172                                       | non_empty_function_call_parameter_list ',' . variable
@@ -18024,14 +18024,14 @@ state 598
     class_constant                     go to state 115
 
 
-state 599
+State 599
 
    24 constant_declaration: constant_declaration ',' "identifier (T_STRING)" '=' static_scalar .
 
     $default  reduce using rule 24 (constant_declaration)
 
 
-state 600
+State 600
 
   364 fully_qualified_class_name: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" . namespace_name
 
@@ -18040,7 +18040,7 @@ state 600
     namespace_name  go to state 679
 
 
-state 601
+State 601
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
   365 fully_qualified_class_name: "\\ (T_NS_SEPARATOR)" namespace_name .
@@ -18050,7 +18050,7 @@ state 601
     $default  reduce using rule 365 (fully_qualified_class_name)
 
 
-state 602
+State 602
 
   114 implements_list: "implements (T_IMPLEMENTS)" . interface_list
 
@@ -18063,14 +18063,14 @@ state 602
     fully_qualified_class_name  go to state 605
 
 
-state 603
+State 603
 
-  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from @30 implements_list . '{' class_statement_list '}'
+  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from $@30 implements_list . '{' class_statement_list '}'
 
     '{'  shift, and go to state 681
 
 
-state 604
+State 604
 
   112 interface_extends_list: "extends (T_EXTENDS)" interface_list .
   116 interface_list: interface_list . ',' fully_qualified_class_name
@@ -18080,25 +18080,25 @@ state 604
     $default  reduce using rule 112 (interface_extends_list)
 
 
-state 605
+State 605
 
   115 interface_list: fully_qualified_class_name .
 
     $default  reduce using rule 115 (interface_list)
 
 
-state 606
+State 606
 
-  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" @31 interface_extends_list '{' . class_statement_list '}'
+  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" $@31 interface_extends_list '{' . class_statement_list '}'
 
     $default  reduce using rule 184 (class_statement_list)
 
     class_statement_list  go to state 683
 
 
-state 607
+State 607
 
-   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" @29 '(' . parameter_list ')' '{' inner_statement_list '}'
+   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" $@29 '(' . parameter_list ')' '{' inner_statement_list '}'
 
     "identifier (T_STRING)"    shift, and go to state 116
     "array (T_ARRAY)"          shift, and go to state 608
@@ -18116,28 +18116,28 @@ state 607
     fully_qualified_class_name  go to state 613
 
 
-state 608
+State 608
 
   163 optional_class_type: "array (T_ARRAY)" .
 
     $default  reduce using rule 163 (optional_class_type)
 
 
-state 609
+State 609
 
   164 optional_class_type: "callable (T_CALLABLE)" .
 
     $default  reduce using rule 164 (optional_class_type)
 
 
-state 610
+State 610
 
   333 expr_without_variable: function is_reference '(' @53 parameter_list . ')' lexical_vars '{' inner_statement_list '}'
 
     ')'  shift, and go to state 685
 
 
-state 611
+State 611
 
   152 parameter_list: non_empty_parameter_list .
   158 non_empty_parameter_list: non_empty_parameter_list . ',' optional_class_type "variable (T_VARIABLE)"
@@ -18150,7 +18150,7 @@ state 611
     $default  reduce using rule 152 (parameter_list)
 
 
-state 612
+State 612
 
   154 non_empty_parameter_list: optional_class_type . "variable (T_VARIABLE)"
   155                         | optional_class_type . '&' "variable (T_VARIABLE)"
@@ -18161,30 +18161,30 @@ state 612
     "variable (T_VARIABLE)"  shift, and go to state 688
 
 
-state 613
+State 613
 
   165 optional_class_type: fully_qualified_class_name .
 
     $default  reduce using rule 165 (optional_class_type)
 
 
-state 614
+State 614
 
-  450 array_function_dereference: function_call @69 '[' dim_offset ']' .
+  450 array_function_dereference: function_call $@69 '[' dim_offset ']' .
 
     $default  reduce using rule 450 (array_function_dereference)
 
 
-state 615
+State 615
 
   471 variable_name: '{' expr '}' .
 
     $default  reduce using rule 471 (variable_name)
 
 
-state 616
+State 616
 
-  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @59 . function_call_parameter_list ')'
+  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@59 . function_call_parameter_list ')'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -18268,9 +18268,9 @@ state 616
     class_constant                          go to state 115
 
 
-state 617
+State 617
 
-  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @58 . function_call_parameter_list ')'
+  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@58 . function_call_parameter_list ')'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -18354,12 +18354,12 @@ state 617
     class_constant                          go to state 115
 
 
-state 618
+State 618
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -18381,9 +18381,9 @@ state 618
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
-  315                      | expr '?' ':' @51 expr .
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
+  315                      | expr '?' ':' $@51 expr .
 
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
     "&& (T_BOOLEAN_AND)"          shift, and go to state 240
@@ -18411,34 +18411,34 @@ state 618
     $default  reduce using rule 315 (expr_without_variable)
 
 
-state 619
+State 619
 
-  313 expr_without_variable: expr '?' @49 expr ':' . @50 expr
+  313 expr_without_variable: expr '?' $@49 expr ':' . $@50 expr
 
-    $default  reduce using rule 312 (@50)
+    $default  reduce using rule 312 ($@50)
 
-    @50  go to state 691
+    $@50  go to state 691
 
 
-state 620
+State 620
 
-  257 expr_without_variable: variable '=' '&' "new (T_NEW)" class_name_reference . @43 ctor_arguments
+  257 expr_without_variable: variable '=' '&' "new (T_NEW)" class_name_reference . $@43 ctor_arguments
 
-    $default  reduce using rule 256 (@43)
+    $default  reduce using rule 256 ($@43)
 
-    @43  go to state 692
+    $@43  go to state 692
 
 
-state 621
+State 621
 
-  358 function_call: variable_without_objects '(' @62 function_call_parameter_list ')' .
+  358 function_call: variable_without_objects '(' $@62 function_call_parameter_list ')' .
 
     $default  reduce using rule 358 (function_call)
 
 
-state 622
+State 622
 
-  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @61 . function_call_parameter_list ')'
+  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@61 . function_call_parameter_list ')'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -18522,9 +18522,9 @@ state 622
     class_constant                          go to state 115
 
 
-state 623
+State 623
 
-  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @60 . function_call_parameter_list ')'
+  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@60 . function_call_parameter_list ')'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -18608,16 +18608,16 @@ state 623
     class_constant                          go to state 115
 
 
-state 624
+State 624
 
-  466 object_property: variable_without_objects @70 .
+  466 object_property: variable_without_objects $@70 .
 
     $default  reduce using rule 466 (object_property)
 
 
-state 625
+State 625
 
-  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" @65 object_property @66 . method_or_not variable_properties
+  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" $@65 object_property $@66 . method_or_not variable_properties
 
     '('  shift, and go to state 695
 
@@ -18628,7 +18628,7 @@ state 625
     method_or_not             go to state 698
 
 
-state 626
+State 626
 
   467 object_dim_list: object_dim_list '[' . dim_offset ']'
 
@@ -18712,7 +18712,7 @@ state 626
     class_constant                     go to state 115
 
 
-state 627
+State 627
 
   468 object_dim_list: object_dim_list '{' . expr '}'
 
@@ -18793,7 +18793,7 @@ state 627
     class_constant                     go to state 115
 
 
-state 628
+State 628
 
   486 non_empty_array_pair_list: non_empty_array_pair_list ',' expr "=> (T_DOUBLE_ARROW)" '&' . w_variable
 
@@ -18820,12 +18820,12 @@ state 628
     simple_indirect_reference          go to state 113
 
 
-state 629
+State 629
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -18847,8 +18847,8 @@ state 629
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   482 non_empty_array_pair_list: non_empty_array_pair_list ',' expr "=> (T_DOUBLE_ARROW)" expr .
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -18881,43 +18881,43 @@ state 629
     $default  reduce using rule 482 (non_empty_array_pair_list)
 
 
-state 630
+State 630
 
   382 ctor_arguments: '(' function_call_parameter_list ')' .
 
     $default  reduce using rule 382 (ctor_arguments)
 
 
-state 631
+State 631
 
-  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" @63 object_property @64 . dynamic_class_name_variable_properties
+  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" $@63 object_property $@64 . dynamic_class_name_variable_properties
 
     $default  reduce using rule 373 (dynamic_class_name_variable_properties)
 
     dynamic_class_name_variable_properties  go to state 702
 
 
-state 632
+State 632
 
-   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' @7 . inner_statement_list @8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
+   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' $@7 . inner_statement_list $@8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
 
     $default  reduce using rule 28 (inner_statement_list)
 
     inner_statement_list  go to state 703
 
 
-state 633
+State 633
 
-   38 unticked_statement: "if (T_IF)" '(' expr ')' @5 statement . @6 elseif_list else_single
+   38 unticked_statement: "if (T_IF)" '(' expr ')' $@5 statement . $@6 elseif_list else_single
 
-    $default  reduce using rule 37 (@6)
+    $default  reduce using rule 37 ($@6)
 
-    @6  go to state 704
+    $@6  go to state 704
 
 
-state 634
+State 634
 
-   47 unticked_statement: "do (T_DO)" @11 statement "while (T_WHILE)" '(' @12 . expr ')' ';'
+   47 unticked_statement: "do (T_DO)" $@11 statement "while (T_WHILE)" '(' $@12 . expr ')' ';'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -18996,9 +18996,9 @@ state 634
     class_constant                     go to state 115
 
 
-state 635
+State 635
 
-   44 unticked_statement: "while (T_WHILE)" '(' @9 expr ')' @10 . while_statement
+   44 unticked_statement: "while (T_WHILE)" '(' $@9 expr ')' $@10 . while_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -19100,20 +19100,20 @@ state 635
     class_constant                     go to state 115
 
 
-state 636
+State 636
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' @13 for_expr . ';' @14 for_expr ')' @15 for_statement
+   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' $@13 for_expr . ';' $@14 for_expr ')' $@15 for_statement
 
     ';'  shift, and go to state 709
 
 
-state 637
+State 637
 
-  237 non_empty_for_expr: non_empty_for_expr ',' @38 expr .
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  237 non_empty_for_expr: non_empty_for_expr ',' $@38 expr .
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -19135,8 +19135,8 @@ state 637
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -19168,9 +19168,9 @@ state 637
     $default  reduce using rule 237 (non_empty_for_expr)
 
 
-state 638
+State 638
 
-   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" @19 variable . foreach_optional_arg ')' @20 foreach_statement
+   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" $@19 variable . foreach_optional_arg ')' $@20 foreach_statement
 
     "=> (T_DOUBLE_ARROW)"  shift, and go to state 710
 
@@ -19179,7 +19179,7 @@ state 638
     foreach_optional_arg  go to state 711
 
 
-state 639
+State 639
 
   120 foreach_variable: '&' . variable
 
@@ -19205,9 +19205,9 @@ state 639
     simple_indirect_reference          go to state 113
 
 
-state 640
+State 640
 
-   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" @17 foreach_variable . foreach_optional_arg ')' @18 foreach_statement
+   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" $@17 foreach_variable . foreach_optional_arg ')' $@18 foreach_statement
 
     "=> (T_DOUBLE_ARROW)"  shift, and go to state 710
 
@@ -19216,28 +19216,28 @@ state 640
     foreach_optional_arg  go to state 713
 
 
-state 641
+State 641
 
   119 foreach_variable: variable .
 
     $default  reduce using rule 119 (foreach_variable)
 
 
-state 642
+State 642
 
   127 declare_list: "identifier (T_STRING)" '=' static_scalar .
 
     $default  reduce using rule 127 (declare_list)
 
 
-state 643
+State 643
 
   128 declare_list: declare_list ',' "identifier (T_STRING)" . '=' static_scalar
 
     '='  shift, and go to state 714
 
 
-state 644
+State 644
 
   126 declare_statement: ':' . inner_statement_list "enddeclare (T_ENDDECLARE)" ';'
 
@@ -19246,21 +19246,21 @@ state 644
     inner_statement_list  go to state 715
 
 
-state 645
+State 645
 
   125 declare_statement: statement .
 
     $default  reduce using rule 125 (declare_statement)
 
 
-state 646
+State 646
 
-   74 unticked_statement: "declare (T_DECLARE)" @21 '(' declare_list ')' declare_statement .
+   74 unticked_statement: "declare (T_DECLARE)" $@21 '(' declare_list ')' declare_statement .
 
     $default  reduce using rule 74 (unticked_statement)
 
 
-state 647
+State 647
 
   131 switch_case_list: ':' . case_list "endswitch (T_ENDSWITCH)" ';'
   132                 | ':' . ';' case_list "endswitch (T_ENDSWITCH)" ';'
@@ -19272,7 +19272,7 @@ state 647
     case_list  go to state 717
 
 
-state 648
+State 648
 
   129 switch_case_list: '{' . case_list '}'
   130                 | '{' . ';' case_list '}'
@@ -19284,14 +19284,14 @@ state 648
     case_list  go to state 719
 
 
-state 649
+State 649
 
-   53 unticked_statement: "switch (T_SWITCH)" '(' expr ')' @16 switch_case_list .
+   53 unticked_statement: "switch (T_SWITCH)" '(' expr ')' $@16 switch_case_list .
 
     $default  reduce using rule 53 (unticked_statement)
 
 
-state 650
+State 650
 
   421 non_empty_static_array_pair_list: static_scalar "=> (T_DOUBLE_ARROW)" . static_scalar
 
@@ -19323,14 +19323,14 @@ state 650
     static_class_constant  go to state 471
 
 
-state 651
+State 651
 
   402 static_scalar: '[' static_array_pair_list ']' .
 
     $default  reduce using rule 402 (static_scalar)
 
 
-state 652
+State 652
 
   418 possible_comma: ',' .
   419 non_empty_static_array_pair_list: non_empty_static_array_pair_list ',' . static_scalar "=> (T_DOUBLE_ARROW)" static_scalar
@@ -19366,21 +19366,21 @@ state 652
     static_class_constant  go to state 471
 
 
-state 653
+State 653
 
   416 static_array_pair_list: non_empty_static_array_pair_list possible_comma .
 
     $default  reduce using rule 416 (static_array_pair_list)
 
 
-state 654
+State 654
 
   401 static_scalar: "array (T_ARRAY)" '(' static_array_pair_list . ')'
 
     ')'  shift, and go to state 722
 
 
-state 655
+State 655
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
   361 class_name: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name .
@@ -19392,44 +19392,44 @@ state 655
     $default                       reduce using rule 397 (static_scalar)
 
 
-state 656
+State 656
 
   405 static_class_constant: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" "identifier (T_STRING)" .
 
     $default  reduce using rule 405 (static_class_constant)
 
 
-state 657
+State 657
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" . '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" . '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
     '('  shift, and go to state 723
 
 
-state 658
+State 658
 
   180 static_var_list: static_var_list ',' "variable (T_VARIABLE)" '=' static_scalar .
 
     $default  reduce using rule 180 (static_var_list)
 
 
-state 659
+State 659
 
   335 expr_without_variable: "static (T_STATIC)" function is_reference '(' @54 parameter_list . ')' lexical_vars '{' inner_statement_list '}'
 
     ')'  shift, and go to state 724
 
 
-state 660
+State 660
 
-  513 isset_variables: isset_variables ',' @73 variable .
+  513 isset_variables: isset_variables ',' $@73 variable .
 
     $default  reduce using rule 513 (isset_variables)
 
 
-state 661
+State 661
 
-  478 assignment_list_element: "list (T_LIST)" '(' @71 . assignment_list ')'
+  478 assignment_list_element: "list (T_LIST)" '(' $@71 . assignment_list ')'
 
     "identifier (T_STRING)"    shift, and go to state 116
     "variable (T_VARIABLE)"    shift, and go to state 34
@@ -19458,16 +19458,16 @@ state 661
     assignment_list_element            go to state 490
 
 
-state 662
+State 662
 
   474 assignment_list: assignment_list ',' assignment_list_element .
 
     $default  reduce using rule 474 (assignment_list)
 
 
-state 663
+State 663
 
-  253 expr_without_variable: "list (T_LIST)" '(' @42 assignment_list ')' '=' . expr
+  253 expr_without_variable: "list (T_LIST)" '(' $@42 assignment_list ')' '=' . expr
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -19546,42 +19546,42 @@ state 663
     class_constant                     go to state 115
 
 
-state 664
+State 664
 
-  496 encaps_var: "variable (T_VARIABLE)" '[' @72 encaps_var_offset ']' .
+  496 encaps_var: "variable (T_VARIABLE)" '[' $@72 encaps_var_offset ']' .
 
     $default  reduce using rule 496 (encaps_var)
 
 
-state 665
+State 665
 
   499 encaps_var: "${ (T_DOLLAR_OPEN_CURLY_BRACES)" "variable name (T_STRING_VARNAME)" '[' expr ']' . '}'
 
     '}'  shift, and go to state 727
 
 
-state 666
+State 666
 
-  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name '(' @56 function_call_parameter_list . ')'
+  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name '(' $@56 function_call_parameter_list . ')'
 
     ')'  shift, and go to state 728
 
 
-state 667
+State 667
 
-   13 top_statement: "namespace (T_NAMESPACE)" namespace_name '{' @2 top_statement_list '}' .
+   13 top_statement: "namespace (T_NAMESPACE)" namespace_name '{' $@2 top_statement_list '}' .
 
     $default  reduce using rule 13 (top_statement)
 
 
-state 668
+State 668
 
-  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name '(' @57 function_call_parameter_list ')' .
+  348 function_call: "\\ (T_NS_SEPARATOR)" namespace_name '(' $@57 function_call_parameter_list ')' .
 
     $default  reduce using rule 348 (function_call)
 
 
-state 669
+State 669
 
   242 chaining_dereference: '[' . dim_offset ']'
 
@@ -19665,9 +19665,9 @@ state 669
     class_constant                     go to state 115
 
 
-state 670
+State 670
 
-  435 variable_property: "-> (T_OBJECT_OPERATOR)" . object_property @67 method_or_not
+  435 variable_property: "-> (T_OBJECT_OPERATOR)" . object_property $@67 method_or_not
 
     "identifier (T_STRING)"  shift, and go to state 436
     "variable (T_VARIABLE)"  shift, and go to state 34
@@ -19683,7 +19683,7 @@ state 670
     simple_indirect_reference  go to state 384
 
 
-state 671
+State 671
 
   239 chaining_method_or_property: chaining_method_or_property . variable_property
   246 chaining_instance_call: chaining_method_or_property .
@@ -19695,42 +19695,42 @@ state 671
     variable_property  go to state 731
 
 
-state 672
+State 672
 
   241 chaining_dereference: chaining_dereference . '[' dim_offset ']'
-  244 chaining_instance_call: chaining_dereference . @39 chaining_method_or_property
+  244 chaining_instance_call: chaining_dereference . $@39 chaining_method_or_property
   245                       | chaining_dereference .
 
     '['  shift, and go to state 732
 
-    "-> (T_OBJECT_OPERATOR)"  reduce using rule 243 (@39)
+    "-> (T_OBJECT_OPERATOR)"  reduce using rule 243 ($@39)
     $default                  reduce using rule 245 (chaining_instance_call)
 
-    @39  go to state 733
+    $@39  go to state 733
 
 
-state 673
+State 673
 
-  249 instance_call: @40 chaining_instance_call .
+  249 instance_call: $@40 chaining_instance_call .
 
     $default  reduce using rule 249 (instance_call)
 
 
-state 674
+State 674
 
   240 chaining_method_or_property: variable_property .
 
     $default  reduce using rule 240 (chaining_method_or_property)
 
 
-state 675
+State 675
 
    32 inner_statement: "__halt_compiler (T_HALT_COMPILER)" '(' ')' . ';'
 
     ';'  shift, and go to state 734
 
 
-state 676
+State 676
 
   173 non_empty_function_call_parameter_list: non_empty_function_call_parameter_list ',' '&' . w_variable
 
@@ -19757,7 +19757,7 @@ state 676
     simple_indirect_reference          go to state 113
 
 
-state 677
+State 677
 
   171 non_empty_function_call_parameter_list: non_empty_function_call_parameter_list ',' expr_without_variable .
   424 expr: expr_without_variable .
@@ -19767,12 +19767,12 @@ state 677
     $default  reduce using rule 424 (expr)
 
 
-state 678
+State 678
 
   172 non_empty_function_call_parameter_list: non_empty_function_call_parameter_list ',' variable .
   254 expr_without_variable: variable . '=' expr
   255                      | variable . '=' '&' variable
-  257                      | variable . '=' '&' "new (T_NEW)" class_name_reference @43 ctor_arguments
+  257                      | variable . '=' '&' "new (T_NEW)" class_name_reference $@43 ctor_arguments
   259                      | variable . "+= (T_PLUS_EQUAL)" expr
   260                      | variable . "-= (T_MINUS_EQUAL)" expr
   261                      | variable . "*= (T_MUL_EQUAL)" expr
@@ -19807,7 +19807,7 @@ state 678
     $default      reduce using rule 425 (r_variable)
 
 
-state 679
+State 679
 
     6 namespace_name: namespace_name . "\\ (T_NS_SEPARATOR)" "identifier (T_STRING)"
   364 fully_qualified_class_name: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name .
@@ -19817,7 +19817,7 @@ state 679
     $default  reduce using rule 364 (fully_qualified_class_name)
 
 
-state 680
+State 680
 
   114 implements_list: "implements (T_IMPLEMENTS)" interface_list .
   116 interface_list: interface_list . ',' fully_qualified_class_name
@@ -19827,16 +19827,16 @@ state 680
     $default  reduce using rule 114 (implements_list)
 
 
-state 681
+State 681
 
-  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from @30 implements_list '{' . class_statement_list '}'
+  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from $@30 implements_list '{' . class_statement_list '}'
 
     $default  reduce using rule 184 (class_statement_list)
 
     class_statement_list  go to state 736
 
 
-state 682
+State 682
 
   116 interface_list: interface_list ',' . fully_qualified_class_name
 
@@ -19848,9 +19848,9 @@ state 682
     fully_qualified_class_name  go to state 737
 
 
-state 683
+State 683
 
-  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" @31 interface_extends_list '{' class_statement_list . '}'
+  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" $@31 interface_extends_list '{' class_statement_list . '}'
   183 class_statement_list: class_statement_list . class_statement
 
     "const (T_CONST)"          shift, and go to state 738
@@ -19875,14 +19875,14 @@ state 683
     class_constant_declaration  go to state 754
 
 
-state 684
+State 684
 
-   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" @29 '(' parameter_list . ')' '{' inner_statement_list '}'
+   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" $@29 '(' parameter_list . ')' '{' inner_statement_list '}'
 
     ')'  shift, and go to state 755
 
 
-state 685
+State 685
 
   333 expr_without_variable: function is_reference '(' @53 parameter_list ')' . lexical_vars '{' inner_statement_list '}'
 
@@ -19893,7 +19893,7 @@ state 685
     lexical_vars  go to state 757
 
 
-state 686
+State 686
 
   158 non_empty_parameter_list: non_empty_parameter_list ',' . optional_class_type "variable (T_VARIABLE)"
   159                         | non_empty_parameter_list ',' . optional_class_type '&' "variable (T_VARIABLE)"
@@ -19913,7 +19913,7 @@ state 686
     fully_qualified_class_name  go to state 613
 
 
-state 687
+State 687
 
   155 non_empty_parameter_list: optional_class_type '&' . "variable (T_VARIABLE)"
   156                         | optional_class_type '&' . "variable (T_VARIABLE)" '=' static_scalar
@@ -19921,7 +19921,7 @@ state 687
     "variable (T_VARIABLE)"  shift, and go to state 759
 
 
-state 688
+State 688
 
   154 non_empty_parameter_list: optional_class_type "variable (T_VARIABLE)" .
   157                         | optional_class_type "variable (T_VARIABLE)" . '=' static_scalar
@@ -19931,23 +19931,23 @@ state 688
     $default  reduce using rule 154 (non_empty_parameter_list)
 
 
-state 689
+State 689
 
-  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @59 function_call_parameter_list . ')'
+  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@59 function_call_parameter_list . ')'
 
     ')'  shift, and go to state 761
 
 
-state 690
+State 690
 
-  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @58 function_call_parameter_list . ')'
+  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@58 function_call_parameter_list . ')'
 
     ')'  shift, and go to state 762
 
 
-state 691
+State 691
 
-  313 expr_without_variable: expr '?' @49 expr ':' @50 . expr
+  313 expr_without_variable: expr '?' $@49 expr ':' $@50 . expr
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -20026,9 +20026,9 @@ state 691
     class_constant                     go to state 115
 
 
-state 692
+State 692
 
-  257 expr_without_variable: variable '=' '&' "new (T_NEW)" class_name_reference @43 . ctor_arguments
+  257 expr_without_variable: variable '=' '&' "new (T_NEW)" class_name_reference $@43 . ctor_arguments
 
     '('  shift, and go to state 443
 
@@ -20037,30 +20037,30 @@ state 692
     ctor_arguments  go to state 764
 
 
-state 693
+State 693
 
-  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @61 function_call_parameter_list . ')'
+  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@61 function_call_parameter_list . ')'
 
     ')'  shift, and go to state 765
 
 
-state 694
+State 694
 
-  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @60 function_call_parameter_list . ')'
+  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@60 function_call_parameter_list . ')'
 
     ')'  shift, and go to state 766
 
 
-state 695
+State 695
 
-  439 method: '(' . @68 function_call_parameter_list ')'
+  439 method: '(' . $@68 function_call_parameter_list ')'
 
-    $default  reduce using rule 438 (@68)
+    $default  reduce using rule 438 ($@68)
 
-    @68  go to state 767
+    $@68  go to state 767
 
 
-state 696
+State 696
 
   436 array_method_dereference: array_method_dereference . '[' dim_offset ']'
   441 method_or_not: array_method_dereference .
@@ -20070,7 +20070,7 @@ state 696
     $default  reduce using rule 441 (method_or_not)
 
 
-state 697
+State 697
 
   437 array_method_dereference: method . '[' dim_offset ']'
   440 method_or_not: method .
@@ -20080,28 +20080,28 @@ state 697
     $default  reduce using rule 440 (method_or_not)
 
 
-state 698
+State 698
 
-  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" @65 object_property @66 method_or_not . variable_properties
+  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" $@65 object_property $@66 method_or_not . variable_properties
 
     $default  reduce using rule 433 (variable_properties)
 
     variable_properties  go to state 770
 
 
-state 699
+State 699
 
   467 object_dim_list: object_dim_list '[' dim_offset . ']'
 
     ']'  shift, and go to state 771
 
 
-state 700
+State 700
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -20123,8 +20123,8 @@ state 700
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
   468 object_dim_list: object_dim_list '{' expr . '}'
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
@@ -20156,16 +20156,16 @@ state 700
     '}'                           shift, and go to state 772
 
 
-state 701
+State 701
 
   486 non_empty_array_pair_list: non_empty_array_pair_list ',' expr "=> (T_DOUBLE_ARROW)" '&' w_variable .
 
     $default  reduce using rule 486 (non_empty_array_pair_list)
 
 
-state 702
+State 702
 
-  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" @63 object_property @64 dynamic_class_name_variable_properties .
+  370 dynamic_class_name_reference: base_variable "-> (T_OBJECT_OPERATOR)" $@63 object_property $@64 dynamic_class_name_variable_properties .
   372 dynamic_class_name_variable_properties: dynamic_class_name_variable_properties . dynamic_class_name_variable_property
 
     "-> (T_OBJECT_OPERATOR)"  shift, and go to state 773
@@ -20175,36 +20175,36 @@ state 702
     dynamic_class_name_variable_property  go to state 774
 
 
-state 703
+State 703
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
-   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' @7 inner_statement_list . @8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
+   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' $@7 inner_statement_list . $@8 new_elseif_list new_else_single "endif (T_ENDIF)" ';'
 
-    "elseif (T_ELSEIF)"  reduce using rule 40 (@8)
-    "else (T_ELSE)"      reduce using rule 40 (@8)
-    "endif (T_ENDIF)"    reduce using rule 40 (@8)
-    $default             reduce using rule 26 (@4)
+    "elseif (T_ELSEIF)"  reduce using rule 40 ($@8)
+    "else (T_ELSE)"      reduce using rule 40 ($@8)
+    "endif (T_ENDIF)"    reduce using rule 40 ($@8)
+    $default             reduce using rule 26 ($@4)
 
-    @4  go to state 366
-    @8  go to state 775
+    $@4  go to state 366
+    $@8  go to state 775
 
 
-state 704
+State 704
 
-   38 unticked_statement: "if (T_IF)" '(' expr ')' @5 statement @6 . elseif_list else_single
+   38 unticked_statement: "if (T_IF)" '(' expr ')' $@5 statement $@6 . elseif_list else_single
 
     $default  reduce using rule 142 (elseif_list)
 
     elseif_list  go to state 776
 
 
-state 705
+State 705
 
-   47 unticked_statement: "do (T_DO)" @11 statement "while (T_WHILE)" '(' @12 expr . ')' ';'
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+   47 unticked_statement: "do (T_DO)" $@11 statement "while (T_WHILE)" '(' $@12 expr . ')' ';'
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -20226,8 +20226,8 @@ state 705
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -20258,7 +20258,7 @@ state 705
     ')'                           shift, and go to state 777
 
 
-state 706
+State 706
 
   141 while_statement: ':' . inner_statement_list "endwhile (T_ENDWHILE)" ';'
 
@@ -20267,30 +20267,30 @@ state 706
     inner_statement_list  go to state 778
 
 
-state 707
+State 707
 
   140 while_statement: statement .
 
     $default  reduce using rule 140 (while_statement)
 
 
-state 708
+State 708
 
-   44 unticked_statement: "while (T_WHILE)" '(' @9 expr ')' @10 while_statement .
+   44 unticked_statement: "while (T_WHILE)" '(' $@9 expr ')' $@10 while_statement .
 
     $default  reduce using rule 44 (unticked_statement)
 
 
-state 709
+State 709
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' @13 for_expr ';' . @14 for_expr ')' @15 for_statement
+   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' $@13 for_expr ';' . $@14 for_expr ')' $@15 for_statement
 
-    $default  reduce using rule 49 (@14)
+    $default  reduce using rule 49 ($@14)
 
-    @14  go to state 779
+    $@14  go to state 779
 
 
-state 710
+State 710
 
   118 foreach_optional_arg: "=> (T_DOUBLE_ARROW)" . foreach_variable
 
@@ -20318,28 +20318,28 @@ state 710
     simple_indirect_reference          go to state 113
 
 
-state 711
+State 711
 
-   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" @19 variable foreach_optional_arg . ')' @20 foreach_statement
+   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" $@19 variable foreach_optional_arg . ')' $@20 foreach_statement
 
     ')'  shift, and go to state 781
 
 
-state 712
+State 712
 
   120 foreach_variable: '&' variable .
 
     $default  reduce using rule 120 (foreach_variable)
 
 
-state 713
+State 713
 
-   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" @17 foreach_variable foreach_optional_arg . ')' @18 foreach_statement
+   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" $@17 foreach_variable foreach_optional_arg . ')' $@18 foreach_statement
 
     ')'  shift, and go to state 782
 
 
-state 714
+State 714
 
   128 declare_list: declare_list ',' "identifier (T_STRING)" '=' . static_scalar
 
@@ -20371,19 +20371,19 @@ state 714
     static_class_constant  go to state 471
 
 
-state 715
+State 715
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
   126 declare_statement: ':' inner_statement_list . "enddeclare (T_ENDDECLARE)" ';'
 
     "enddeclare (T_ENDDECLARE)"  shift, and go to state 784
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
-state 716
+State 716
 
   132 switch_case_list: ':' ';' . case_list "endswitch (T_ENDSWITCH)" ';'
 
@@ -20392,18 +20392,18 @@ state 716
     case_list  go to state 785
 
 
-state 717
+State 717
 
   131 switch_case_list: ':' case_list . "endswitch (T_ENDSWITCH)" ';'
-  135 case_list: case_list . "case (T_CASE)" expr case_separator @32 inner_statement_list
-  137          | case_list . "default (T_DEFAULT)" case_separator @33 inner_statement_list
+  135 case_list: case_list . "case (T_CASE)" expr case_separator $@32 inner_statement_list
+  137          | case_list . "default (T_DEFAULT)" case_separator $@33 inner_statement_list
 
     "endswitch (T_ENDSWITCH)"  shift, and go to state 786
     "case (T_CASE)"            shift, and go to state 787
     "default (T_DEFAULT)"      shift, and go to state 788
 
 
-state 718
+State 718
 
   130 switch_case_list: '{' ';' . case_list '}'
 
@@ -20412,25 +20412,25 @@ state 718
     case_list  go to state 789
 
 
-state 719
+State 719
 
   129 switch_case_list: '{' case_list . '}'
-  135 case_list: case_list . "case (T_CASE)" expr case_separator @32 inner_statement_list
-  137          | case_list . "default (T_DEFAULT)" case_separator @33 inner_statement_list
+  135 case_list: case_list . "case (T_CASE)" expr case_separator $@32 inner_statement_list
+  137          | case_list . "default (T_DEFAULT)" case_separator $@33 inner_statement_list
 
     "case (T_CASE)"        shift, and go to state 787
     "default (T_DEFAULT)"  shift, and go to state 788
     '}'                    shift, and go to state 790
 
 
-state 720
+State 720
 
   421 non_empty_static_array_pair_list: static_scalar "=> (T_DOUBLE_ARROW)" static_scalar .
 
     $default  reduce using rule 421 (non_empty_static_array_pair_list)
 
 
-state 721
+State 721
 
   419 non_empty_static_array_pair_list: non_empty_static_array_pair_list ',' static_scalar . "=> (T_DOUBLE_ARROW)" static_scalar
   420                                 | non_empty_static_array_pair_list ',' static_scalar .
@@ -20440,23 +20440,23 @@ state 721
     $default  reduce using rule 420 (non_empty_static_array_pair_list)
 
 
-state 722
+State 722
 
   401 static_scalar: "array (T_ARRAY)" '(' static_array_pair_list ')' .
 
     $default  reduce using rule 401 (static_scalar)
 
 
-state 723
+State 723
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' . @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' . $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
-    $default  reduce using rule 77 (@23)
+    $default  reduce using rule 77 ($@23)
 
-    @23  go to state 792
+    $@23  go to state 792
 
 
-state 724
+State 724
 
   335 expr_without_variable: "static (T_STATIC)" function is_reference '(' @54 parameter_list ')' . lexical_vars '{' inner_statement_list '}'
 
@@ -20467,22 +20467,22 @@ state 724
     lexical_vars  go to state 793
 
 
-state 725
+State 725
 
   474 assignment_list: assignment_list . ',' assignment_list_element
-  478 assignment_list_element: "list (T_LIST)" '(' @71 assignment_list . ')'
+  478 assignment_list_element: "list (T_LIST)" '(' $@71 assignment_list . ')'
 
     ','  shift, and go to state 582
     ')'  shift, and go to state 794
 
 
-state 726
+State 726
 
-  253 expr_without_variable: "list (T_LIST)" '(' @42 assignment_list ')' '=' expr .
-  275                      | expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  253 expr_without_variable: "list (T_LIST)" '(' $@42 assignment_list ')' '=' expr .
+  275                      | expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -20504,8 +20504,8 @@ state 726
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     '?'                           shift, and go to state 238
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
@@ -20534,44 +20534,44 @@ state 726
     $default  reduce using rule 253 (expr_without_variable)
 
 
-state 727
+State 727
 
   499 encaps_var: "${ (T_DOLLAR_OPEN_CURLY_BRACES)" "variable name (T_STRING_VARNAME)" '[' expr ']' '}' .
 
     $default  reduce using rule 499 (encaps_var)
 
 
-state 728
+State 728
 
-  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name '(' @56 function_call_parameter_list ')' .
+  346 function_call: "namespace (T_NAMESPACE)" "\\ (T_NS_SEPARATOR)" namespace_name '(' $@56 function_call_parameter_list ')' .
 
     $default  reduce using rule 346 (function_call)
 
 
-state 729
+State 729
 
   242 chaining_dereference: '[' dim_offset . ']'
 
     ']'  shift, and go to state 795
 
 
-state 730
+State 730
 
-  435 variable_property: "-> (T_OBJECT_OPERATOR)" object_property . @67 method_or_not
+  435 variable_property: "-> (T_OBJECT_OPERATOR)" object_property . $@67 method_or_not
 
-    $default  reduce using rule 434 (@67)
+    $default  reduce using rule 434 ($@67)
 
-    @67  go to state 796
+    $@67  go to state 796
 
 
-state 731
+State 731
 
   239 chaining_method_or_property: chaining_method_or_property variable_property .
 
     $default  reduce using rule 239 (chaining_method_or_property)
 
 
-state 732
+State 732
 
   241 chaining_dereference: chaining_dereference '[' . dim_offset ']'
 
@@ -20655,9 +20655,9 @@ state 732
     class_constant                     go to state 115
 
 
-state 733
+State 733
 
-  244 chaining_instance_call: chaining_dereference @39 . chaining_method_or_property
+  244 chaining_instance_call: chaining_dereference $@39 . chaining_method_or_property
 
     "-> (T_OBJECT_OPERATOR)"  shift, and go to state 670
 
@@ -20665,23 +20665,23 @@ state 733
     variable_property            go to state 674
 
 
-state 734
+State 734
 
    32 inner_statement: "__halt_compiler (T_HALT_COMPILER)" '(' ')' ';' .
 
     $default  reduce using rule 32 (inner_statement)
 
 
-state 735
+State 735
 
   173 non_empty_function_call_parameter_list: non_empty_function_call_parameter_list ',' '&' w_variable .
 
     $default  reduce using rule 173 (non_empty_function_call_parameter_list)
 
 
-state 736
+State 736
 
-  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from @30 implements_list '{' class_statement_list . '}'
+  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from $@30 implements_list '{' class_statement_list . '}'
   183 class_statement_list: class_statement_list . class_statement
 
     "const (T_CONST)"          shift, and go to state 738
@@ -20706,21 +20706,21 @@ state 736
     class_constant_declaration  go to state 754
 
 
-state 737
+State 737
 
   116 interface_list: interface_list ',' fully_qualified_class_name .
 
     $default  reduce using rule 116 (interface_list)
 
 
-state 738
+State 738
 
   231 class_constant_declaration: "const (T_CONST)" . "identifier (T_STRING)" '=' static_scalar
 
     "identifier (T_STRING)"  shift, and go to state 800
 
 
-state 739
+State 739
 
   191 trait_use_statement: "use (T_USE)" . trait_list trait_adaptations
 
@@ -20733,95 +20733,95 @@ state 739
     fully_qualified_class_name  go to state 802
 
 
-state 740
+State 740
 
   220 member_modifier: "public (T_PUBLIC)" .
 
     $default  reduce using rule 220 (member_modifier)
 
 
-state 741
+State 741
 
   221 member_modifier: "protected (T_PROTECTED)" .
 
     $default  reduce using rule 221 (member_modifier)
 
 
-state 742
+State 742
 
   222 member_modifier: "private (T_PRIVATE)" .
 
     $default  reduce using rule 222 (member_modifier)
 
 
-state 743
+State 743
 
   225 member_modifier: "final (T_FINAL)" .
 
     $default  reduce using rule 225 (member_modifier)
 
 
-state 744
+State 744
 
   224 member_modifier: "abstract (T_ABSTRACT)" .
 
     $default  reduce using rule 224 (member_modifier)
 
 
-state 745
+State 745
 
   223 member_modifier: "static (T_STATIC)" .
 
     $default  reduce using rule 223 (member_modifier)
 
 
-state 746
+State 746
 
   215 variable_modifiers: "var (T_VAR)" .
 
     $default  reduce using rule 215 (variable_modifiers)
 
 
-state 747
+State 747
 
-  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" @31 interface_extends_list '{' class_statement_list '}' .
+  103 unticked_class_declaration_statement: interface_entry "identifier (T_STRING)" $@31 interface_extends_list '{' class_statement_list '}' .
 
     $default  reduce using rule 103 (unticked_class_declaration_statement)
 
 
-state 748
+State 748
 
   183 class_statement_list: class_statement_list class_statement .
 
     $default  reduce using rule 183 (class_statement_list)
 
 
-state 749
+State 749
 
   188 class_statement: trait_use_statement .
 
     $default  reduce using rule 188 (class_statement)
 
 
-state 750
+State 750
 
-  186 class_statement: variable_modifiers . @36 class_variable_declaration ';'
+  186 class_statement: variable_modifiers . $@36 class_variable_declaration ';'
 
-    $default  reduce using rule 185 (@36)
+    $default  reduce using rule 185 ($@36)
 
-    @36  go to state 803
+    $@36  go to state 803
 
 
-state 751
+State 751
 
-  190 class_statement: method_modifiers . function is_reference "identifier (T_STRING)" @37 '(' parameter_list ')' method_body
+  190 class_statement: method_modifiers . function is_reference "identifier (T_STRING)" $@37 '(' parameter_list ')' method_body
 
     "function (T_FUNCTION)"  shift, and go to state 47
 
     function  go to state 804
 
 
-state 752
+State 752
 
   214 variable_modifiers: non_empty_member_modifiers .
   217 method_modifiers: non_empty_member_modifiers .
@@ -20840,14 +20840,14 @@ state 752
     member_modifier  go to state 805
 
 
-state 753
+State 753
 
   218 non_empty_member_modifiers: member_modifier .
 
     $default  reduce using rule 218 (non_empty_member_modifiers)
 
 
-state 754
+State 754
 
   187 class_statement: class_constant_declaration . ';'
   230 class_constant_declaration: class_constant_declaration . ',' "identifier (T_STRING)" '=' static_scalar
@@ -20856,28 +20856,28 @@ state 754
     ';'  shift, and go to state 807
 
 
-state 755
+State 755
 
-   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" @29 '(' parameter_list ')' . '{' inner_statement_list '}'
+   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" $@29 '(' parameter_list ')' . '{' inner_statement_list '}'
 
     '{'  shift, and go to state 808
 
 
-state 756
+State 756
 
   338 lexical_vars: "use (T_USE)" . '(' lexical_var_list ')'
 
     '('  shift, and go to state 809
 
 
-state 757
+State 757
 
   333 expr_without_variable: function is_reference '(' @53 parameter_list ')' lexical_vars . '{' inner_statement_list '}'
 
     '{'  shift, and go to state 810
 
 
-state 758
+State 758
 
   158 non_empty_parameter_list: non_empty_parameter_list ',' optional_class_type . "variable (T_VARIABLE)"
   159                         | non_empty_parameter_list ',' optional_class_type . '&' "variable (T_VARIABLE)"
@@ -20888,7 +20888,7 @@ state 758
     "variable (T_VARIABLE)"  shift, and go to state 812
 
 
-state 759
+State 759
 
   155 non_empty_parameter_list: optional_class_type '&' "variable (T_VARIABLE)" .
   156                         | optional_class_type '&' "variable (T_VARIABLE)" . '=' static_scalar
@@ -20898,7 +20898,7 @@ state 759
     $default  reduce using rule 155 (non_empty_parameter_list)
 
 
-state 760
+State 760
 
   157 non_empty_parameter_list: optional_class_type "variable (T_VARIABLE)" '=' . static_scalar
 
@@ -20930,26 +20930,26 @@ state 760
     static_class_constant  go to state 471
 
 
-state 761
+State 761
 
-  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @59 function_call_parameter_list ')' .
+  352 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@59 function_call_parameter_list ')' .
 
     $default  reduce using rule 352 (function_call)
 
 
-state 762
+State 762
 
-  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @58 function_call_parameter_list ')' .
+  350 function_call: class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@58 function_call_parameter_list ')' .
 
     $default  reduce using rule 350 (function_call)
 
 
-state 763
+State 763
 
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -20971,9 +20971,9 @@ state 763
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  313                      | expr '?' @49 expr ':' @50 expr .
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  313                      | expr '?' $@49 expr ':' $@50 expr .
+  315                      | expr . '?' ':' $@51 expr
 
     "|| (T_BOOLEAN_OR)"           shift, and go to state 239
     "&& (T_BOOLEAN_AND)"          shift, and go to state 240
@@ -21001,30 +21001,30 @@ state 763
     $default  reduce using rule 313 (expr_without_variable)
 
 
-state 764
+State 764
 
-  257 expr_without_variable: variable '=' '&' "new (T_NEW)" class_name_reference @43 ctor_arguments .
+  257 expr_without_variable: variable '=' '&' "new (T_NEW)" class_name_reference $@43 ctor_arguments .
 
     $default  reduce using rule 257 (expr_without_variable)
 
 
-state 765
+State 765
 
-  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' @61 function_call_parameter_list ')' .
+  356 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_without_objects '(' $@61 function_call_parameter_list ')' .
 
     $default  reduce using rule 356 (function_call)
 
 
-state 766
+State 766
 
-  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' @60 function_call_parameter_list ')' .
+  354 function_call: variable_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" variable_name '(' $@60 function_call_parameter_list ')' .
 
     $default  reduce using rule 354 (function_call)
 
 
-state 767
+State 767
 
-  439 method: '(' @68 . function_call_parameter_list ')'
+  439 method: '(' $@68 . function_call_parameter_list ')'
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -21108,7 +21108,7 @@ state 767
     class_constant                          go to state 115
 
 
-state 768
+State 768
 
   436 array_method_dereference: array_method_dereference '[' . dim_offset ']'
 
@@ -21192,7 +21192,7 @@ state 768
     class_constant                     go to state 115
 
 
-state 769
+State 769
 
   437 array_method_dereference: method '[' . dim_offset ']'
 
@@ -21276,9 +21276,9 @@ state 769
     class_constant                     go to state 115
 
 
-state 770
+State 770
 
-  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" @65 object_property @66 method_or_not variable_properties .
+  430 variable: base_variable_with_function_calls "-> (T_OBJECT_OPERATOR)" $@65 object_property $@66 method_or_not variable_properties .
   432 variable_properties: variable_properties . variable_property
 
     "-> (T_OBJECT_OPERATOR)"  shift, and go to state 670
@@ -21288,21 +21288,21 @@ state 770
     variable_property  go to state 818
 
 
-state 771
+State 771
 
   467 object_dim_list: object_dim_list '[' dim_offset ']' .
 
     $default  reduce using rule 467 (object_dim_list)
 
 
-state 772
+State 772
 
   468 object_dim_list: object_dim_list '{' expr '}' .
 
     $default  reduce using rule 468 (object_dim_list)
 
 
-state 773
+State 773
 
   374 dynamic_class_name_variable_property: "-> (T_OBJECT_OPERATOR)" . object_property
 
@@ -21320,26 +21320,26 @@ state 773
     simple_indirect_reference  go to state 384
 
 
-state 774
+State 774
 
   372 dynamic_class_name_variable_properties: dynamic_class_name_variable_properties dynamic_class_name_variable_property .
 
     $default  reduce using rule 372 (dynamic_class_name_variable_properties)
 
 
-state 775
+State 775
 
-   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' @7 inner_statement_list @8 . new_elseif_list new_else_single "endif (T_ENDIF)" ';'
+   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' $@7 inner_statement_list $@8 . new_elseif_list new_else_single "endif (T_ENDIF)" ';'
 
     $default  reduce using rule 145 (new_elseif_list)
 
     new_elseif_list  go to state 820
 
 
-state 776
+State 776
 
-   38 unticked_statement: "if (T_IF)" '(' expr ')' @5 statement @6 elseif_list . else_single
-  144 elseif_list: elseif_list . "elseif (T_ELSEIF)" '(' expr ')' @34 statement
+   38 unticked_statement: "if (T_IF)" '(' expr ')' $@5 statement $@6 elseif_list . else_single
+  144 elseif_list: elseif_list . "elseif (T_ELSEIF)" '(' expr ')' $@34 statement
 
     "elseif (T_ELSEIF)"  shift, and go to state 821
     "else (T_ELSE)"      shift, and go to state 822
@@ -21351,28 +21351,28 @@ state 776
     else_single  go to state 823
 
 
-state 777
+State 777
 
-   47 unticked_statement: "do (T_DO)" @11 statement "while (T_WHILE)" '(' @12 expr ')' . ';'
+   47 unticked_statement: "do (T_DO)" $@11 statement "while (T_WHILE)" '(' $@12 expr ')' . ';'
 
     ';'  shift, and go to state 824
 
 
-state 778
+State 778
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
   141 while_statement: ':' inner_statement_list . "endwhile (T_ENDWHILE)" ';'
 
     "endwhile (T_ENDWHILE)"  shift, and go to state 825
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
-state 779
+State 779
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' @13 for_expr ';' @14 . for_expr ')' @15 for_statement
+   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' $@13 for_expr ';' $@14 . for_expr ')' $@15 for_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -21455,66 +21455,66 @@ state 779
     class_constant                     go to state 115
 
 
-state 780
+State 780
 
   118 foreach_optional_arg: "=> (T_DOUBLE_ARROW)" foreach_variable .
 
     $default  reduce using rule 118 (foreach_optional_arg)
 
 
-state 781
+State 781
 
-   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" @19 variable foreach_optional_arg ')' . @20 foreach_statement
+   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" $@19 variable foreach_optional_arg ')' . $@20 foreach_statement
 
-    $default  reduce using rule 71 (@20)
+    $default  reduce using rule 71 ($@20)
 
-    @20  go to state 827
+    $@20  go to state 827
 
 
-state 782
+State 782
 
-   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" @17 foreach_variable foreach_optional_arg ')' . @18 foreach_statement
+   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" $@17 foreach_variable foreach_optional_arg ')' . $@18 foreach_statement
 
-    $default  reduce using rule 68 (@18)
+    $default  reduce using rule 68 ($@18)
 
-    @18  go to state 828
+    $@18  go to state 828
 
 
-state 783
+State 783
 
   128 declare_list: declare_list ',' "identifier (T_STRING)" '=' static_scalar .
 
     $default  reduce using rule 128 (declare_list)
 
 
-state 784
+State 784
 
   126 declare_statement: ':' inner_statement_list "enddeclare (T_ENDDECLARE)" . ';'
 
     ';'  shift, and go to state 829
 
 
-state 785
+State 785
 
   132 switch_case_list: ':' ';' case_list . "endswitch (T_ENDSWITCH)" ';'
-  135 case_list: case_list . "case (T_CASE)" expr case_separator @32 inner_statement_list
-  137          | case_list . "default (T_DEFAULT)" case_separator @33 inner_statement_list
+  135 case_list: case_list . "case (T_CASE)" expr case_separator $@32 inner_statement_list
+  137          | case_list . "default (T_DEFAULT)" case_separator $@33 inner_statement_list
 
     "endswitch (T_ENDSWITCH)"  shift, and go to state 830
     "case (T_CASE)"            shift, and go to state 787
     "default (T_DEFAULT)"      shift, and go to state 788
 
 
-state 786
+State 786
 
   131 switch_case_list: ':' case_list "endswitch (T_ENDSWITCH)" . ';'
 
     ';'  shift, and go to state 831
 
 
-state 787
+State 787
 
-  135 case_list: case_list "case (T_CASE)" . expr case_separator @32 inner_statement_list
+  135 case_list: case_list "case (T_CASE)" . expr case_separator $@32 inner_statement_list
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -21593,9 +21593,9 @@ state 787
     class_constant                     go to state 115
 
 
-state 788
+State 788
 
-  137 case_list: case_list "default (T_DEFAULT)" . case_separator @33 inner_statement_list
+  137 case_list: case_list "default (T_DEFAULT)" . case_separator $@33 inner_statement_list
 
     ':'  shift, and go to state 833
     ';'  shift, and go to state 834
@@ -21603,25 +21603,25 @@ state 788
     case_separator  go to state 835
 
 
-state 789
+State 789
 
   130 switch_case_list: '{' ';' case_list . '}'
-  135 case_list: case_list . "case (T_CASE)" expr case_separator @32 inner_statement_list
-  137          | case_list . "default (T_DEFAULT)" case_separator @33 inner_statement_list
+  135 case_list: case_list . "case (T_CASE)" expr case_separator $@32 inner_statement_list
+  137          | case_list . "default (T_DEFAULT)" case_separator $@33 inner_statement_list
 
     "case (T_CASE)"        shift, and go to state 787
     "default (T_DEFAULT)"  shift, and go to state 788
     '}'                    shift, and go to state 836
 
 
-state 790
+State 790
 
   129 switch_case_list: '{' case_list '}' .
 
     $default  reduce using rule 129 (switch_case_list)
 
 
-state 791
+State 791
 
   419 non_empty_static_array_pair_list: non_empty_static_array_pair_list ',' static_scalar "=> (T_DOUBLE_ARROW)" . static_scalar
 
@@ -21653,9 +21653,9 @@ state 791
     static_class_constant  go to state 471
 
 
-state 792
+State 792
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 . fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 . fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
     "identifier (T_STRING)"    shift, and go to state 116
     "namespace (T_NAMESPACE)"  shift, and go to state 514
@@ -21665,30 +21665,30 @@ state 792
     fully_qualified_class_name  go to state 838
 
 
-state 793
+State 793
 
   335 expr_without_variable: "static (T_STATIC)" function is_reference '(' @54 parameter_list ')' lexical_vars . '{' inner_statement_list '}'
 
     '{'  shift, and go to state 839
 
 
-state 794
+State 794
 
-  478 assignment_list_element: "list (T_LIST)" '(' @71 assignment_list ')' .
+  478 assignment_list_element: "list (T_LIST)" '(' $@71 assignment_list ')' .
 
     $default  reduce using rule 478 (assignment_list_element)
 
 
-state 795
+State 795
 
   242 chaining_dereference: '[' dim_offset ']' .
 
     $default  reduce using rule 242 (chaining_dereference)
 
 
-state 796
+State 796
 
-  435 variable_property: "-> (T_OBJECT_OPERATOR)" object_property @67 . method_or_not
+  435 variable_property: "-> (T_OBJECT_OPERATOR)" object_property $@67 . method_or_not
 
     '('  shift, and go to state 695
 
@@ -21699,17 +21699,17 @@ state 796
     method_or_not             go to state 840
 
 
-state 797
+State 797
 
   241 chaining_dereference: chaining_dereference '[' dim_offset . ']'
 
     ']'  shift, and go to state 841
 
 
-state 798
+State 798
 
   239 chaining_method_or_property: chaining_method_or_property . variable_property
-  244 chaining_instance_call: chaining_dereference @39 chaining_method_or_property .
+  244 chaining_instance_call: chaining_dereference $@39 chaining_method_or_property .
 
     "-> (T_OBJECT_OPERATOR)"  shift, and go to state 670
 
@@ -21718,21 +21718,21 @@ state 798
     variable_property  go to state 731
 
 
-state 799
+State 799
 
-  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from @30 implements_list '{' class_statement_list '}' .
+  101 unticked_class_declaration_statement: class_entry_type "identifier (T_STRING)" extends_from $@30 implements_list '{' class_statement_list '}' .
 
     $default  reduce using rule 101 (unticked_class_declaration_statement)
 
 
-state 800
+State 800
 
   231 class_constant_declaration: "const (T_CONST)" "identifier (T_STRING)" . '=' static_scalar
 
     '='  shift, and go to state 842
 
 
-state 801
+State 801
 
   191 trait_use_statement: "use (T_USE)" trait_list . trait_adaptations
   193 trait_list: trait_list . ',' fully_qualified_class_name
@@ -21744,25 +21744,25 @@ state 801
     trait_adaptations  go to state 846
 
 
-state 802
+State 802
 
   192 trait_list: fully_qualified_class_name .
 
     $default  reduce using rule 192 (trait_list)
 
 
-state 803
+State 803
 
-  186 class_statement: variable_modifiers @36 . class_variable_declaration ';'
+  186 class_statement: variable_modifiers $@36 . class_variable_declaration ';'
 
     "variable (T_VARIABLE)"  shift, and go to state 847
 
     class_variable_declaration  go to state 848
 
 
-state 804
+State 804
 
-  190 class_statement: method_modifiers function . is_reference "identifier (T_STRING)" @37 '(' parameter_list ')' method_body
+  190 class_statement: method_modifiers function . is_reference "identifier (T_STRING)" $@37 '(' parameter_list ')' method_body
 
     '&'  shift, and go to state 231
 
@@ -21771,37 +21771,37 @@ state 804
     is_reference  go to state 849
 
 
-state 805
+State 805
 
   219 non_empty_member_modifiers: non_empty_member_modifiers member_modifier .
 
     $default  reduce using rule 219 (non_empty_member_modifiers)
 
 
-state 806
+State 806
 
   230 class_constant_declaration: class_constant_declaration ',' . "identifier (T_STRING)" '=' static_scalar
 
     "identifier (T_STRING)"  shift, and go to state 850
 
 
-state 807
+State 807
 
   187 class_statement: class_constant_declaration ';' .
 
     $default  reduce using rule 187 (class_statement)
 
 
-state 808
+State 808
 
-   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" @29 '(' parameter_list ')' '{' . inner_statement_list '}'
+   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" $@29 '(' parameter_list ')' '{' . inner_statement_list '}'
 
     $default  reduce using rule 28 (inner_statement_list)
 
     inner_statement_list  go to state 851
 
 
-state 809
+State 809
 
   338 lexical_vars: "use (T_USE)" '(' . lexical_var_list ')'
 
@@ -21811,7 +21811,7 @@ state 809
     lexical_var_list  go to state 854
 
 
-state 810
+State 810
 
   333 expr_without_variable: function is_reference '(' @53 parameter_list ')' lexical_vars '{' . inner_statement_list '}'
 
@@ -21820,7 +21820,7 @@ state 810
     inner_statement_list  go to state 855
 
 
-state 811
+State 811
 
   159 non_empty_parameter_list: non_empty_parameter_list ',' optional_class_type '&' . "variable (T_VARIABLE)"
   160                         | non_empty_parameter_list ',' optional_class_type '&' . "variable (T_VARIABLE)" '=' static_scalar
@@ -21828,7 +21828,7 @@ state 811
     "variable (T_VARIABLE)"  shift, and go to state 856
 
 
-state 812
+State 812
 
   158 non_empty_parameter_list: non_empty_parameter_list ',' optional_class_type "variable (T_VARIABLE)" .
   161                         | non_empty_parameter_list ',' optional_class_type "variable (T_VARIABLE)" . '=' static_scalar
@@ -21838,7 +21838,7 @@ state 812
     $default  reduce using rule 158 (non_empty_parameter_list)
 
 
-state 813
+State 813
 
   156 non_empty_parameter_list: optional_class_type '&' "variable (T_VARIABLE)" '=' . static_scalar
 
@@ -21870,52 +21870,52 @@ state 813
     static_class_constant  go to state 471
 
 
-state 814
+State 814
 
   157 non_empty_parameter_list: optional_class_type "variable (T_VARIABLE)" '=' static_scalar .
 
     $default  reduce using rule 157 (non_empty_parameter_list)
 
 
-state 815
+State 815
 
-  439 method: '(' @68 function_call_parameter_list . ')'
+  439 method: '(' $@68 function_call_parameter_list . ')'
 
     ')'  shift, and go to state 859
 
 
-state 816
+State 816
 
   436 array_method_dereference: array_method_dereference '[' dim_offset . ']'
 
     ']'  shift, and go to state 860
 
 
-state 817
+State 817
 
   437 array_method_dereference: method '[' dim_offset . ']'
 
     ']'  shift, and go to state 861
 
 
-state 818
+State 818
 
   432 variable_properties: variable_properties variable_property .
 
     $default  reduce using rule 432 (variable_properties)
 
 
-state 819
+State 819
 
   374 dynamic_class_name_variable_property: "-> (T_OBJECT_OPERATOR)" object_property .
 
     $default  reduce using rule 374 (dynamic_class_name_variable_property)
 
 
-state 820
+State 820
 
-   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' @7 inner_statement_list @8 new_elseif_list . new_else_single "endif (T_ENDIF)" ';'
-  147 new_elseif_list: new_elseif_list . "elseif (T_ELSEIF)" '(' expr ')' ':' @35 inner_statement_list
+   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' $@7 inner_statement_list $@8 new_elseif_list . new_else_single "endif (T_ENDIF)" ';'
+  147 new_elseif_list: new_elseif_list . "elseif (T_ELSEIF)" '(' expr ')' ':' $@35 inner_statement_list
 
     "elseif (T_ELSEIF)"  shift, and go to state 862
     "else (T_ELSE)"      shift, and go to state 863
@@ -21925,14 +21925,14 @@ state 820
     new_else_single  go to state 864
 
 
-state 821
+State 821
 
-  144 elseif_list: elseif_list "elseif (T_ELSEIF)" . '(' expr ')' @34 statement
+  144 elseif_list: elseif_list "elseif (T_ELSEIF)" . '(' expr ')' $@34 statement
 
     '('  shift, and go to state 865
 
 
-state 822
+State 822
 
   149 else_single: "else (T_ELSE)" . statement
 
@@ -22034,37 +22034,37 @@ state 822
     class_constant                     go to state 115
 
 
-state 823
+State 823
 
-   38 unticked_statement: "if (T_IF)" '(' expr ')' @5 statement @6 elseif_list else_single .
+   38 unticked_statement: "if (T_IF)" '(' expr ')' $@5 statement $@6 elseif_list else_single .
 
     $default  reduce using rule 38 (unticked_statement)
 
 
-state 824
+State 824
 
-   47 unticked_statement: "do (T_DO)" @11 statement "while (T_WHILE)" '(' @12 expr ')' ';' .
+   47 unticked_statement: "do (T_DO)" $@11 statement "while (T_WHILE)" '(' $@12 expr ')' ';' .
 
     $default  reduce using rule 47 (unticked_statement)
 
 
-state 825
+State 825
 
   141 while_statement: ':' inner_statement_list "endwhile (T_ENDWHILE)" . ';'
 
     ';'  shift, and go to state 867
 
 
-state 826
+State 826
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' @13 for_expr ';' @14 for_expr . ')' @15 for_statement
+   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' $@13 for_expr ';' $@14 for_expr . ')' $@15 for_statement
 
     ')'  shift, and go to state 868
 
 
-state 827
+State 827
 
-   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" @19 variable foreach_optional_arg ')' @20 . foreach_statement
+   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" $@19 variable foreach_optional_arg ')' $@20 . foreach_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -22166,9 +22166,9 @@ state 827
     class_constant                     go to state 115
 
 
-state 828
+State 828
 
-   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" @17 foreach_variable foreach_optional_arg ')' @18 . foreach_statement
+   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" $@17 foreach_variable foreach_optional_arg ')' $@18 . foreach_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -22270,34 +22270,34 @@ state 828
     class_constant                     go to state 115
 
 
-state 829
+State 829
 
   126 declare_statement: ':' inner_statement_list "enddeclare (T_ENDDECLARE)" ';' .
 
     $default  reduce using rule 126 (declare_statement)
 
 
-state 830
+State 830
 
   132 switch_case_list: ':' ';' case_list "endswitch (T_ENDSWITCH)" . ';'
 
     ';'  shift, and go to state 873
 
 
-state 831
+State 831
 
   131 switch_case_list: ':' case_list "endswitch (T_ENDSWITCH)" ';' .
 
     $default  reduce using rule 131 (switch_case_list)
 
 
-state 832
+State 832
 
-  135 case_list: case_list "case (T_CASE)" expr . case_separator @32 inner_statement_list
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  135 case_list: case_list "case (T_CASE)" expr . case_separator $@32 inner_statement_list
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -22319,8 +22319,8 @@ state 832
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -22354,53 +22354,53 @@ state 832
     case_separator  go to state 874
 
 
-state 833
+State 833
 
   138 case_separator: ':' .
 
     $default  reduce using rule 138 (case_separator)
 
 
-state 834
+State 834
 
   139 case_separator: ';' .
 
     $default  reduce using rule 139 (case_separator)
 
 
-state 835
+State 835
 
-  137 case_list: case_list "default (T_DEFAULT)" case_separator . @33 inner_statement_list
+  137 case_list: case_list "default (T_DEFAULT)" case_separator . $@33 inner_statement_list
 
-    $default  reduce using rule 136 (@33)
+    $default  reduce using rule 136 ($@33)
 
-    @33  go to state 875
+    $@33  go to state 875
 
 
-state 836
+State 836
 
   130 switch_case_list: '{' ';' case_list '}' .
 
     $default  reduce using rule 130 (switch_case_list)
 
 
-state 837
+State 837
 
   419 non_empty_static_array_pair_list: non_empty_static_array_pair_list ',' static_scalar "=> (T_DOUBLE_ARROW)" static_scalar .
 
     $default  reduce using rule 419 (non_empty_static_array_pair_list)
 
 
-state 838
+State 838
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name . @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name . $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
-    $default  reduce using rule 78 (@24)
+    $default  reduce using rule 78 ($@24)
 
-    @24  go to state 876
+    $@24  go to state 876
 
 
-state 839
+State 839
 
   335 expr_without_variable: "static (T_STATIC)" function is_reference '(' @54 parameter_list ')' lexical_vars '{' . inner_statement_list '}'
 
@@ -22409,21 +22409,21 @@ state 839
     inner_statement_list  go to state 877
 
 
-state 840
+State 840
 
-  435 variable_property: "-> (T_OBJECT_OPERATOR)" object_property @67 method_or_not .
+  435 variable_property: "-> (T_OBJECT_OPERATOR)" object_property $@67 method_or_not .
 
     $default  reduce using rule 435 (variable_property)
 
 
-state 841
+State 841
 
   241 chaining_dereference: chaining_dereference '[' dim_offset ']' .
 
     $default  reduce using rule 241 (chaining_dereference)
 
 
-state 842
+State 842
 
   231 class_constant_declaration: "const (T_CONST)" "identifier (T_STRING)" '=' . static_scalar
 
@@ -22455,7 +22455,7 @@ state 842
     static_class_constant  go to state 471
 
 
-state 843
+State 843
 
   193 trait_list: trait_list ',' . fully_qualified_class_name
 
@@ -22467,14 +22467,14 @@ state 843
     fully_qualified_class_name  go to state 879
 
 
-state 844
+State 844
 
   194 trait_adaptations: ';' .
 
     $default  reduce using rule 194 (trait_adaptations)
 
 
-state 845
+State 845
 
   195 trait_adaptations: '{' . trait_adaptation_list '}'
 
@@ -22495,14 +22495,14 @@ state 845
     fully_qualified_class_name              go to state 888
 
 
-state 846
+State 846
 
   191 trait_use_statement: "use (T_USE)" trait_list trait_adaptations .
 
     $default  reduce using rule 191 (trait_use_statement)
 
 
-state 847
+State 847
 
   228 class_variable_declaration: "variable (T_VARIABLE)" .
   229                           | "variable (T_VARIABLE)" . '=' static_scalar
@@ -22512,9 +22512,9 @@ state 847
     $default  reduce using rule 228 (class_variable_declaration)
 
 
-state 848
+State 848
 
-  186 class_statement: variable_modifiers @36 class_variable_declaration . ';'
+  186 class_statement: variable_modifiers $@36 class_variable_declaration . ';'
   226 class_variable_declaration: class_variable_declaration . ',' "variable (T_VARIABLE)"
   227                           | class_variable_declaration . ',' "variable (T_VARIABLE)" '=' static_scalar
 
@@ -22522,47 +22522,47 @@ state 848
     ';'  shift, and go to state 891
 
 
-state 849
+State 849
 
-  190 class_statement: method_modifiers function is_reference . "identifier (T_STRING)" @37 '(' parameter_list ')' method_body
+  190 class_statement: method_modifiers function is_reference . "identifier (T_STRING)" $@37 '(' parameter_list ')' method_body
 
     "identifier (T_STRING)"  shift, and go to state 892
 
 
-state 850
+State 850
 
   230 class_constant_declaration: class_constant_declaration ',' "identifier (T_STRING)" . '=' static_scalar
 
     '='  shift, and go to state 893
 
 
-state 851
+State 851
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
-   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" @29 '(' parameter_list ')' '{' inner_statement_list . '}'
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
+   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" $@29 '(' parameter_list ')' '{' inner_statement_list . '}'
 
     '}'  shift, and go to state 894
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
-state 852
+State 852
 
   342 lexical_var_list: '&' . "variable (T_VARIABLE)"
 
     "variable (T_VARIABLE)"  shift, and go to state 895
 
 
-state 853
+State 853
 
   341 lexical_var_list: "variable (T_VARIABLE)" .
 
     $default  reduce using rule 341 (lexical_var_list)
 
 
-state 854
+State 854
 
   338 lexical_vars: "use (T_USE)" '(' lexical_var_list . ')'
   339 lexical_var_list: lexical_var_list . ',' "variable (T_VARIABLE)"
@@ -22572,19 +22572,19 @@ state 854
     ')'  shift, and go to state 897
 
 
-state 855
+State 855
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
   333 expr_without_variable: function is_reference '(' @53 parameter_list ')' lexical_vars '{' inner_statement_list . '}'
 
     '}'  shift, and go to state 898
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
-state 856
+State 856
 
   159 non_empty_parameter_list: non_empty_parameter_list ',' optional_class_type '&' "variable (T_VARIABLE)" .
   160                         | non_empty_parameter_list ',' optional_class_type '&' "variable (T_VARIABLE)" . '=' static_scalar
@@ -22594,7 +22594,7 @@ state 856
     $default  reduce using rule 159 (non_empty_parameter_list)
 
 
-state 857
+State 857
 
   161 non_empty_parameter_list: non_empty_parameter_list ',' optional_class_type "variable (T_VARIABLE)" '=' . static_scalar
 
@@ -22626,58 +22626,58 @@ state 857
     static_class_constant  go to state 471
 
 
-state 858
+State 858
 
   156 non_empty_parameter_list: optional_class_type '&' "variable (T_VARIABLE)" '=' static_scalar .
 
     $default  reduce using rule 156 (non_empty_parameter_list)
 
 
-state 859
+State 859
 
-  439 method: '(' @68 function_call_parameter_list ')' .
+  439 method: '(' $@68 function_call_parameter_list ')' .
 
     $default  reduce using rule 439 (method)
 
 
-state 860
+State 860
 
   436 array_method_dereference: array_method_dereference '[' dim_offset ']' .
 
     $default  reduce using rule 436 (array_method_dereference)
 
 
-state 861
+State 861
 
   437 array_method_dereference: method '[' dim_offset ']' .
 
     $default  reduce using rule 437 (array_method_dereference)
 
 
-state 862
+State 862
 
-  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" . '(' expr ')' ':' @35 inner_statement_list
+  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" . '(' expr ')' ':' $@35 inner_statement_list
 
     '('  shift, and go to state 901
 
 
-state 863
+State 863
 
   151 new_else_single: "else (T_ELSE)" . ':' inner_statement_list
 
     ':'  shift, and go to state 902
 
 
-state 864
+State 864
 
-   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' @7 inner_statement_list @8 new_elseif_list new_else_single . "endif (T_ENDIF)" ';'
+   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' $@7 inner_statement_list $@8 new_elseif_list new_else_single . "endif (T_ENDIF)" ';'
 
     "endif (T_ENDIF)"  shift, and go to state 903
 
 
-state 865
+State 865
 
-  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' . expr ')' @34 statement
+  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' . expr ')' $@34 statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -22756,30 +22756,30 @@ state 865
     class_constant                     go to state 115
 
 
-state 866
+State 866
 
   149 else_single: "else (T_ELSE)" statement .
 
     $default  reduce using rule 149 (else_single)
 
 
-state 867
+State 867
 
   141 while_statement: ':' inner_statement_list "endwhile (T_ENDWHILE)" ';' .
 
     $default  reduce using rule 141 (while_statement)
 
 
-state 868
+State 868
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' @13 for_expr ';' @14 for_expr ')' . @15 for_statement
+   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' $@13 for_expr ';' $@14 for_expr ')' . $@15 for_statement
 
-    $default  reduce using rule 50 (@15)
+    $default  reduce using rule 50 ($@15)
 
-    @15  go to state 905
+    $@15  go to state 905
 
 
-state 869
+State 869
 
   124 foreach_statement: ':' . inner_statement_list "endforeach (T_ENDFOREACH)" ';'
 
@@ -22788,86 +22788,86 @@ state 869
     inner_statement_list  go to state 906
 
 
-state 870
+State 870
 
   123 foreach_statement: statement .
 
     $default  reduce using rule 123 (foreach_statement)
 
 
-state 871
+State 871
 
-   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" @19 variable foreach_optional_arg ')' @20 foreach_statement .
+   72 unticked_statement: "foreach (T_FOREACH)" '(' expr_without_variable "as (T_AS)" $@19 variable foreach_optional_arg ')' $@20 foreach_statement .
 
     $default  reduce using rule 72 (unticked_statement)
 
 
-state 872
+State 872
 
-   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" @17 foreach_variable foreach_optional_arg ')' @18 foreach_statement .
+   69 unticked_statement: "foreach (T_FOREACH)" '(' variable "as (T_AS)" $@17 foreach_variable foreach_optional_arg ')' $@18 foreach_statement .
 
     $default  reduce using rule 69 (unticked_statement)
 
 
-state 873
+State 873
 
   132 switch_case_list: ':' ';' case_list "endswitch (T_ENDSWITCH)" ';' .
 
     $default  reduce using rule 132 (switch_case_list)
 
 
-state 874
+State 874
 
-  135 case_list: case_list "case (T_CASE)" expr case_separator . @32 inner_statement_list
+  135 case_list: case_list "case (T_CASE)" expr case_separator . $@32 inner_statement_list
 
-    $default  reduce using rule 134 (@32)
+    $default  reduce using rule 134 ($@32)
 
-    @32  go to state 907
+    $@32  go to state 907
 
 
-state 875
+State 875
 
-  137 case_list: case_list "default (T_DEFAULT)" case_separator @33 . inner_statement_list
+  137 case_list: case_list "default (T_DEFAULT)" case_separator $@33 . inner_statement_list
 
     $default  reduce using rule 28 (inner_statement_list)
 
     inner_statement_list  go to state 908
 
 
-state 876
+State 876
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 . "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 . "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
     "variable (T_VARIABLE)"  shift, and go to state 909
 
 
-state 877
+State 877
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
   335 expr_without_variable: "static (T_STATIC)" function is_reference '(' @54 parameter_list ')' lexical_vars '{' inner_statement_list . '}'
 
     '}'  shift, and go to state 910
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
-state 878
+State 878
 
   231 class_constant_declaration: "const (T_CONST)" "identifier (T_STRING)" '=' static_scalar .
 
     $default  reduce using rule 231 (class_constant_declaration)
 
 
-state 879
+State 879
 
   193 trait_list: trait_list ',' fully_qualified_class_name .
 
     $default  reduce using rule 193 (trait_list)
 
 
-state 880
+State 880
 
     5 namespace_name: "identifier (T_STRING)" .
   205 trait_method_reference: "identifier (T_STRING)" .
@@ -22876,14 +22876,14 @@ state 880
     $default     reduce using rule 5 (namespace_name)
 
 
-state 881
+State 881
 
   195 trait_adaptations: '{' trait_adaptation_list . '}'
 
     '}'  shift, and go to state 911
 
 
-state 882
+State 882
 
   197 trait_adaptation_list: non_empty_trait_adaptation_list .
   199 non_empty_trait_adaptation_list: non_empty_trait_adaptation_list . trait_adaptation_statement
@@ -22903,21 +22903,21 @@ state 882
     fully_qualified_class_name              go to state 888
 
 
-state 883
+State 883
 
   198 non_empty_trait_adaptation_list: trait_adaptation_statement .
 
     $default  reduce using rule 198 (non_empty_trait_adaptation_list)
 
 
-state 884
+State 884
 
   200 trait_adaptation_statement: trait_precedence . ';'
 
     ';'  shift, and go to state 913
 
 
-state 885
+State 885
 
   208 trait_alias: trait_method_reference . "as (T_AS)" trait_modifiers "identifier (T_STRING)"
   209            | trait_method_reference . "as (T_AS)" member_modifier
@@ -22925,7 +22925,7 @@ state 885
     "as (T_AS)"  shift, and go to state 914
 
 
-state 886
+State 886
 
   202 trait_precedence: trait_method_reference_fully_qualified . "insteadof (T_INSTEADOF)" trait_reference_list
   206 trait_method_reference: trait_method_reference_fully_qualified .
@@ -22935,21 +22935,21 @@ state 886
     $default  reduce using rule 206 (trait_method_reference)
 
 
-state 887
+State 887
 
   201 trait_adaptation_statement: trait_alias . ';'
 
     ';'  shift, and go to state 916
 
 
-state 888
+State 888
 
   207 trait_method_reference_fully_qualified: fully_qualified_class_name . ":: (T_PAAMAYIM_NEKUDOTAYIM)" "identifier (T_STRING)"
 
     ":: (T_PAAMAYIM_NEKUDOTAYIM)"  shift, and go to state 917
 
 
-state 889
+State 889
 
   229 class_variable_declaration: "variable (T_VARIABLE)" '=' . static_scalar
 
@@ -22981,7 +22981,7 @@ state 889
     static_class_constant  go to state 471
 
 
-state 890
+State 890
 
   226 class_variable_declaration: class_variable_declaration ',' . "variable (T_VARIABLE)"
   227                           | class_variable_declaration ',' . "variable (T_VARIABLE)" '=' static_scalar
@@ -22989,23 +22989,23 @@ state 890
     "variable (T_VARIABLE)"  shift, and go to state 919
 
 
-state 891
+State 891
 
-  186 class_statement: variable_modifiers @36 class_variable_declaration ';' .
+  186 class_statement: variable_modifiers $@36 class_variable_declaration ';' .
 
     $default  reduce using rule 186 (class_statement)
 
 
-state 892
+State 892
 
-  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" . @37 '(' parameter_list ')' method_body
+  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" . $@37 '(' parameter_list ')' method_body
 
-    $default  reduce using rule 189 (@37)
+    $default  reduce using rule 189 ($@37)
 
-    @37  go to state 920
+    $@37  go to state 920
 
 
-state 893
+State 893
 
   230 class_constant_declaration: class_constant_declaration ',' "identifier (T_STRING)" '=' . static_scalar
 
@@ -23037,21 +23037,21 @@ state 893
     static_class_constant  go to state 471
 
 
-state 894
+State 894
 
-   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" @29 '(' parameter_list ')' '{' inner_statement_list '}' .
+   99 unticked_function_declaration_statement: function is_reference "identifier (T_STRING)" $@29 '(' parameter_list ')' '{' inner_statement_list '}' .
 
     $default  reduce using rule 99 (unticked_function_declaration_statement)
 
 
-state 895
+State 895
 
   342 lexical_var_list: '&' "variable (T_VARIABLE)" .
 
     $default  reduce using rule 342 (lexical_var_list)
 
 
-state 896
+State 896
 
   339 lexical_var_list: lexical_var_list ',' . "variable (T_VARIABLE)"
   340                 | lexical_var_list ',' . '&' "variable (T_VARIABLE)"
@@ -23060,21 +23060,21 @@ state 896
     "variable (T_VARIABLE)"  shift, and go to state 923
 
 
-state 897
+State 897
 
   338 lexical_vars: "use (T_USE)" '(' lexical_var_list ')' .
 
     $default  reduce using rule 338 (lexical_vars)
 
 
-state 898
+State 898
 
   333 expr_without_variable: function is_reference '(' @53 parameter_list ')' lexical_vars '{' inner_statement_list '}' .
 
     $default  reduce using rule 333 (expr_without_variable)
 
 
-state 899
+State 899
 
   160 non_empty_parameter_list: non_empty_parameter_list ',' optional_class_type '&' "variable (T_VARIABLE)" '=' . static_scalar
 
@@ -23106,16 +23106,16 @@ state 899
     static_class_constant  go to state 471
 
 
-state 900
+State 900
 
   161 non_empty_parameter_list: non_empty_parameter_list ',' optional_class_type "variable (T_VARIABLE)" '=' static_scalar .
 
     $default  reduce using rule 161 (non_empty_parameter_list)
 
 
-state 901
+State 901
 
-  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' . expr ')' ':' @35 inner_statement_list
+  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' . expr ')' ':' $@35 inner_statement_list
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -23194,7 +23194,7 @@ state 901
     class_constant                     go to state 115
 
 
-state 902
+State 902
 
   151 new_else_single: "else (T_ELSE)" ':' . inner_statement_list
 
@@ -23203,20 +23203,20 @@ state 902
     inner_statement_list  go to state 926
 
 
-state 903
+State 903
 
-   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' @7 inner_statement_list @8 new_elseif_list new_else_single "endif (T_ENDIF)" . ';'
+   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' $@7 inner_statement_list $@8 new_elseif_list new_else_single "endif (T_ENDIF)" . ';'
 
     ';'  shift, and go to state 927
 
 
-state 904
+State 904
 
-  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' expr . ')' @34 statement
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' expr . ')' $@34 statement
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -23238,8 +23238,8 @@ state 904
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -23270,9 +23270,9 @@ state 904
     ')'                           shift, and go to state 928
 
 
-state 905
+State 905
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' @13 for_expr ';' @14 for_expr ')' @15 . for_statement
+   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' $@13 for_expr ';' $@14 for_expr ')' $@15 . for_statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -23374,77 +23374,77 @@ state 905
     class_constant                     go to state 115
 
 
-state 906
+State 906
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
   124 foreach_statement: ':' inner_statement_list . "endforeach (T_ENDFOREACH)" ';'
 
     "endforeach (T_ENDFOREACH)"  shift, and go to state 932
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
-state 907
+State 907
 
-  135 case_list: case_list "case (T_CASE)" expr case_separator @32 . inner_statement_list
+  135 case_list: case_list "case (T_CASE)" expr case_separator $@32 . inner_statement_list
 
     $default  reduce using rule 28 (inner_statement_list)
 
     inner_statement_list  go to state 933
 
 
-state 908
+State 908
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
-  137 case_list: case_list "default (T_DEFAULT)" case_separator @33 inner_statement_list .
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
+  137 case_list: case_list "default (T_DEFAULT)" case_separator $@33 inner_statement_list .
 
     "endswitch (T_ENDSWITCH)"  reduce using rule 137 (case_list)
     "case (T_CASE)"            reduce using rule 137 (case_list)
     "default (T_DEFAULT)"      reduce using rule 137 (case_list)
     '}'                        reduce using rule 137 (case_list)
-    $default                   reduce using rule 26 (@4)
+    $default                   reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
-state 909
+State 909
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" . ')' @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" . ')' $@25 '{' inner_statement_list '}' $@26 additional_catches
 
     ')'  shift, and go to state 934
 
 
-state 910
+State 910
 
   335 expr_without_variable: "static (T_STATIC)" function is_reference '(' @54 parameter_list ')' lexical_vars '{' inner_statement_list '}' .
 
     $default  reduce using rule 335 (expr_without_variable)
 
 
-state 911
+State 911
 
   195 trait_adaptations: '{' trait_adaptation_list '}' .
 
     $default  reduce using rule 195 (trait_adaptations)
 
 
-state 912
+State 912
 
   199 non_empty_trait_adaptation_list: non_empty_trait_adaptation_list trait_adaptation_statement .
 
     $default  reduce using rule 199 (non_empty_trait_adaptation_list)
 
 
-state 913
+State 913
 
   200 trait_adaptation_statement: trait_precedence ';' .
 
     $default  reduce using rule 200 (trait_adaptation_statement)
 
 
-state 914
+State 914
 
   208 trait_alias: trait_method_reference "as (T_AS)" . trait_modifiers "identifier (T_STRING)"
   209            | trait_method_reference "as (T_AS)" . member_modifier
@@ -23462,7 +23462,7 @@ state 914
     member_modifier  go to state 936
 
 
-state 915
+State 915
 
   202 trait_precedence: trait_method_reference_fully_qualified "insteadof (T_INSTEADOF)" . trait_reference_list
 
@@ -23475,28 +23475,28 @@ state 915
     fully_qualified_class_name  go to state 938
 
 
-state 916
+State 916
 
   201 trait_adaptation_statement: trait_alias ';' .
 
     $default  reduce using rule 201 (trait_adaptation_statement)
 
 
-state 917
+State 917
 
   207 trait_method_reference_fully_qualified: fully_qualified_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" . "identifier (T_STRING)"
 
     "identifier (T_STRING)"  shift, and go to state 939
 
 
-state 918
+State 918
 
   229 class_variable_declaration: "variable (T_VARIABLE)" '=' static_scalar .
 
     $default  reduce using rule 229 (class_variable_declaration)
 
 
-state 919
+State 919
 
   226 class_variable_declaration: class_variable_declaration ',' "variable (T_VARIABLE)" .
   227                           | class_variable_declaration ',' "variable (T_VARIABLE)" . '=' static_scalar
@@ -23506,48 +23506,48 @@ state 919
     $default  reduce using rule 226 (class_variable_declaration)
 
 
-state 920
+State 920
 
-  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" @37 . '(' parameter_list ')' method_body
+  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" $@37 . '(' parameter_list ')' method_body
 
     '('  shift, and go to state 941
 
 
-state 921
+State 921
 
   230 class_constant_declaration: class_constant_declaration ',' "identifier (T_STRING)" '=' static_scalar .
 
     $default  reduce using rule 230 (class_constant_declaration)
 
 
-state 922
+State 922
 
   340 lexical_var_list: lexical_var_list ',' '&' . "variable (T_VARIABLE)"
 
     "variable (T_VARIABLE)"  shift, and go to state 942
 
 
-state 923
+State 923
 
   339 lexical_var_list: lexical_var_list ',' "variable (T_VARIABLE)" .
 
     $default  reduce using rule 339 (lexical_var_list)
 
 
-state 924
+State 924
 
   160 non_empty_parameter_list: non_empty_parameter_list ',' optional_class_type '&' "variable (T_VARIABLE)" '=' static_scalar .
 
     $default  reduce using rule 160 (non_empty_parameter_list)
 
 
-state 925
+State 925
 
-  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr . ')' ':' @35 inner_statement_list
-  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" @44 expr
-  277                      | expr . "&& (T_BOOLEAN_AND)" @45 expr
-  279                      | expr . "or (T_LOGICAL_OR)" @46 expr
-  281                      | expr . "and (T_LOGICAL_AND)" @47 expr
+  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr . ')' ':' $@35 inner_statement_list
+  275 expr_without_variable: expr . "|| (T_BOOLEAN_OR)" $@44 expr
+  277                      | expr . "&& (T_BOOLEAN_AND)" $@45 expr
+  279                      | expr . "or (T_LOGICAL_OR)" $@46 expr
+  281                      | expr . "and (T_LOGICAL_AND)" $@47 expr
   282                      | expr . "xor (T_LOGICAL_XOR)" expr
   283                      | expr . '|' expr
   284                      | expr . '&' expr
@@ -23569,8 +23569,8 @@ state 925
   304                      | expr . '>' expr
   305                      | expr . ">= (T_IS_GREATER_OR_EQUAL)" expr
   306                      | expr . "instanceof (T_INSTANCEOF)" class_name_reference
-  313                      | expr . '?' @49 expr ':' @50 expr
-  315                      | expr . '?' ':' @51 expr
+  313                      | expr . '?' $@49 expr ':' $@50 expr
+  315                      | expr . '?' ':' $@51 expr
 
     "or (T_LOGICAL_OR)"           shift, and go to state 235
     "xor (T_LOGICAL_XOR)"         shift, and go to state 236
@@ -23601,34 +23601,34 @@ state 925
     ')'                           shift, and go to state 943
 
 
-state 926
+State 926
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
   151 new_else_single: "else (T_ELSE)" ':' inner_statement_list .
 
     "endif (T_ENDIF)"  reduce using rule 151 (new_else_single)
-    $default           reduce using rule 26 (@4)
+    $default           reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
-state 927
+State 927
 
-   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' @7 inner_statement_list @8 new_elseif_list new_else_single "endif (T_ENDIF)" ';' .
+   41 unticked_statement: "if (T_IF)" '(' expr ')' ':' $@7 inner_statement_list $@8 new_elseif_list new_else_single "endif (T_ENDIF)" ';' .
 
     $default  reduce using rule 41 (unticked_statement)
 
 
-state 928
+State 928
 
-  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' expr ')' . @34 statement
+  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' expr ')' . $@34 statement
 
-    $default  reduce using rule 143 (@34)
+    $default  reduce using rule 143 ($@34)
 
-    @34  go to state 944
+    $@34  go to state 944
 
 
-state 929
+State 929
 
   122 for_statement: ':' . inner_statement_list "endfor (T_ENDFOR)" ';'
 
@@ -23637,58 +23637,58 @@ state 929
     inner_statement_list  go to state 945
 
 
-state 930
+State 930
 
   121 for_statement: statement .
 
     $default  reduce using rule 121 (for_statement)
 
 
-state 931
+State 931
 
-   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' @13 for_expr ';' @14 for_expr ')' @15 for_statement .
+   51 unticked_statement: "for (T_FOR)" '(' for_expr ';' $@13 for_expr ';' $@14 for_expr ')' $@15 for_statement .
 
     $default  reduce using rule 51 (unticked_statement)
 
 
-state 932
+State 932
 
   124 foreach_statement: ':' inner_statement_list "endforeach (T_ENDFOREACH)" . ';'
 
     ';'  shift, and go to state 946
 
 
-state 933
+State 933
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
-  135 case_list: case_list "case (T_CASE)" expr case_separator @32 inner_statement_list .
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
+  135 case_list: case_list "case (T_CASE)" expr case_separator $@32 inner_statement_list .
 
     "endswitch (T_ENDSWITCH)"  reduce using rule 135 (case_list)
     "case (T_CASE)"            reduce using rule 135 (case_list)
     "default (T_DEFAULT)"      reduce using rule 135 (case_list)
     '}'                        reduce using rule 135 (case_list)
-    $default                   reduce using rule 26 (@4)
+    $default                   reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
-state 934
+State 934
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' . @25 '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' . $@25 '{' inner_statement_list '}' $@26 additional_catches
 
-    $default  reduce using rule 79 (@25)
+    $default  reduce using rule 79 ($@25)
 
-    @25  go to state 947
+    $@25  go to state 947
 
 
-state 935
+State 935
 
   208 trait_alias: trait_method_reference "as (T_AS)" trait_modifiers . "identifier (T_STRING)"
 
     "identifier (T_STRING)"  shift, and go to state 948
 
 
-state 936
+State 936
 
   209 trait_alias: trait_method_reference "as (T_AS)" member_modifier .
   211 trait_modifiers: member_modifier .
@@ -23697,7 +23697,7 @@ state 936
     $default                 reduce using rule 209 (trait_alias)
 
 
-state 937
+State 937
 
   202 trait_precedence: trait_method_reference_fully_qualified "insteadof (T_INSTEADOF)" trait_reference_list .
   204 trait_reference_list: trait_reference_list . ',' fully_qualified_class_name
@@ -23707,21 +23707,21 @@ state 937
     $default  reduce using rule 202 (trait_precedence)
 
 
-state 938
+State 938
 
   203 trait_reference_list: fully_qualified_class_name .
 
     $default  reduce using rule 203 (trait_reference_list)
 
 
-state 939
+State 939
 
   207 trait_method_reference_fully_qualified: fully_qualified_class_name ":: (T_PAAMAYIM_NEKUDOTAYIM)" "identifier (T_STRING)" .
 
     $default  reduce using rule 207 (trait_method_reference_fully_qualified)
 
 
-state 940
+State 940
 
   227 class_variable_declaration: class_variable_declaration ',' "variable (T_VARIABLE)" '=' . static_scalar
 
@@ -23753,9 +23753,9 @@ state 940
     static_class_constant  go to state 471
 
 
-state 941
+State 941
 
-  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" @37 '(' . parameter_list ')' method_body
+  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" $@37 '(' . parameter_list ')' method_body
 
     "identifier (T_STRING)"    shift, and go to state 116
     "array (T_ARRAY)"          shift, and go to state 608
@@ -23773,23 +23773,23 @@ state 941
     fully_qualified_class_name  go to state 613
 
 
-state 942
+State 942
 
   340 lexical_var_list: lexical_var_list ',' '&' "variable (T_VARIABLE)" .
 
     $default  reduce using rule 340 (lexical_var_list)
 
 
-state 943
+State 943
 
-  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr ')' . ':' @35 inner_statement_list
+  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr ')' . ':' $@35 inner_statement_list
 
     ':'  shift, and go to state 952
 
 
-state 944
+State 944
 
-  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' expr ')' @34 . statement
+  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' expr ')' $@34 . statement
 
     "require_once (T_REQUIRE_ONCE)"               shift, and go to state 5
     "require (T_REQUIRE)"                         shift, and go to state 6
@@ -23889,40 +23889,40 @@ state 944
     class_constant                     go to state 115
 
 
-state 945
+State 945
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
   122 for_statement: ':' inner_statement_list . "endfor (T_ENDFOR)" ';'
 
     "endfor (T_ENDFOR)"  shift, and go to state 954
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
-state 946
+State 946
 
   124 foreach_statement: ':' inner_statement_list "endforeach (T_ENDFOREACH)" ';' .
 
     $default  reduce using rule 124 (foreach_statement)
 
 
-state 947
+State 947
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 . '{' inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 . '{' inner_statement_list '}' $@26 additional_catches
 
     '{'  shift, and go to state 955
 
 
-state 948
+State 948
 
   208 trait_alias: trait_method_reference "as (T_AS)" trait_modifiers "identifier (T_STRING)" .
 
     $default  reduce using rule 208 (trait_alias)
 
 
-state 949
+State 949
 
   204 trait_reference_list: trait_reference_list ',' . fully_qualified_class_name
 
@@ -23934,62 +23934,62 @@ state 949
     fully_qualified_class_name  go to state 956
 
 
-state 950
+State 950
 
   227 class_variable_declaration: class_variable_declaration ',' "variable (T_VARIABLE)" '=' static_scalar .
 
     $default  reduce using rule 227 (class_variable_declaration)
 
 
-state 951
+State 951
 
-  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" @37 '(' parameter_list . ')' method_body
+  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" $@37 '(' parameter_list . ')' method_body
 
     ')'  shift, and go to state 957
 
 
-state 952
+State 952
 
-  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr ')' ':' . @35 inner_statement_list
+  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr ')' ':' . $@35 inner_statement_list
 
-    $default  reduce using rule 146 (@35)
+    $default  reduce using rule 146 ($@35)
 
-    @35  go to state 958
+    $@35  go to state 958
 
 
-state 953
+State 953
 
-  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' expr ')' @34 statement .
+  144 elseif_list: elseif_list "elseif (T_ELSEIF)" '(' expr ')' $@34 statement .
 
     $default  reduce using rule 144 (elseif_list)
 
 
-state 954
+State 954
 
   122 for_statement: ':' inner_statement_list "endfor (T_ENDFOR)" . ';'
 
     ';'  shift, and go to state 959
 
 
-state 955
+State 955
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' . inner_statement_list '}' @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' . inner_statement_list '}' $@26 additional_catches
 
     $default  reduce using rule 28 (inner_statement_list)
 
     inner_statement_list  go to state 960
 
 
-state 956
+State 956
 
   204 trait_reference_list: trait_reference_list ',' fully_qualified_class_name .
 
     $default  reduce using rule 204 (trait_reference_list)
 
 
-state 957
+State 957
 
-  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" @37 '(' parameter_list ')' . method_body
+  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" $@37 '(' parameter_list ')' . method_body
 
     ';'  shift, and go to state 961
     '{'  shift, and go to state 962
@@ -23997,42 +23997,42 @@ state 957
     method_body  go to state 963
 
 
-state 958
+State 958
 
-  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr ')' ':' @35 . inner_statement_list
+  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr ')' ':' $@35 . inner_statement_list
 
     $default  reduce using rule 28 (inner_statement_list)
 
     inner_statement_list  go to state 964
 
 
-state 959
+State 959
 
   122 for_statement: ':' inner_statement_list "endfor (T_ENDFOR)" ';' .
 
     $default  reduce using rule 122 (for_statement)
 
 
-state 960
+State 960
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list . '}' @26 additional_catches
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list . '}' $@26 additional_catches
 
     '}'  shift, and go to state 965
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
-state 961
+State 961
 
   212 method_body: ';' .
 
     $default  reduce using rule 212 (method_body)
 
 
-state 962
+State 962
 
   213 method_body: '{' . inner_statement_list '}'
 
@@ -24041,50 +24041,50 @@ state 962
     inner_statement_list  go to state 966
 
 
-state 963
+State 963
 
-  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" @37 '(' parameter_list ')' method_body .
+  190 class_statement: method_modifiers function is_reference "identifier (T_STRING)" $@37 '(' parameter_list ')' method_body .
 
     $default  reduce using rule 190 (class_statement)
 
 
-state 964
+State 964
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
-  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr ')' ':' @35 inner_statement_list .
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
+  147 new_elseif_list: new_elseif_list "elseif (T_ELSEIF)" '(' expr ')' ':' $@35 inner_statement_list .
 
     "elseif (T_ELSEIF)"  reduce using rule 147 (new_elseif_list)
     "else (T_ELSE)"      reduce using rule 147 (new_elseif_list)
     "endif (T_ENDIF)"    reduce using rule 147 (new_elseif_list)
-    $default             reduce using rule 26 (@4)
+    $default             reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
-state 965
+State 965
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' . @26 additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' . $@26 additional_catches
 
-    $default  reduce using rule 80 (@26)
+    $default  reduce using rule 80 ($@26)
 
-    @26  go to state 967
+    $@26  go to state 967
 
 
-state 966
+State 966
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
   213 method_body: '{' inner_statement_list . '}'
 
     '}'  shift, and go to state 968
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
-state 967
+State 967
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 . additional_catches
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 . additional_catches
 
     "catch (T_CATCH)"  shift, and go to state 969
 
@@ -24095,28 +24095,28 @@ state 967
     additional_catch              go to state 972
 
 
-state 968
+State 968
 
   213 method_body: '{' inner_statement_list '}' .
 
     $default  reduce using rule 213 (method_body)
 
 
-state 969
+State 969
 
-   90 additional_catch: "catch (T_CATCH)" . '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' @28 '{' inner_statement_list '}'
+   90 additional_catch: "catch (T_CATCH)" . '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' $@28 '{' inner_statement_list '}'
 
     '('  shift, and go to state 973
 
 
-state 970
+State 970
 
-   81 unticked_statement: "try (T_TRY)" @22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' @23 fully_qualified_class_name @24 "variable (T_VARIABLE)" ')' @25 '{' inner_statement_list '}' @26 additional_catches .
+   81 unticked_statement: "try (T_TRY)" $@22 '{' inner_statement_list '}' "catch (T_CATCH)" '(' $@23 fully_qualified_class_name $@24 "variable (T_VARIABLE)" ')' $@25 '{' inner_statement_list '}' $@26 additional_catches .
 
     $default  reduce using rule 81 (unticked_statement)
 
 
-state 971
+State 971
 
    84 additional_catches: non_empty_additional_catches .
    87 non_empty_additional_catches: non_empty_additional_catches . additional_catch
@@ -24128,16 +24128,16 @@ state 971
     additional_catch  go to state 974
 
 
-state 972
+State 972
 
    86 non_empty_additional_catches: additional_catch .
 
     $default  reduce using rule 86 (non_empty_additional_catches)
 
 
-state 973
+State 973
 
-   90 additional_catch: "catch (T_CATCH)" '(' . fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' @28 '{' inner_statement_list '}'
+   90 additional_catch: "catch (T_CATCH)" '(' . fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' $@28 '{' inner_statement_list '}'
 
     "identifier (T_STRING)"    shift, and go to state 116
     "namespace (T_NAMESPACE)"  shift, and go to state 514
@@ -24147,75 +24147,75 @@ state 973
     fully_qualified_class_name  go to state 975
 
 
-state 974
+State 974
 
    87 non_empty_additional_catches: non_empty_additional_catches additional_catch .
 
     $default  reduce using rule 87 (non_empty_additional_catches)
 
 
-state 975
+State 975
 
-   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name . @27 "variable (T_VARIABLE)" ')' @28 '{' inner_statement_list '}'
+   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name . @27 "variable (T_VARIABLE)" ')' $@28 '{' inner_statement_list '}'
 
     $default  reduce using rule 88 (@27)
 
     @27  go to state 976
 
 
-state 976
+State 976
 
-   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 . "variable (T_VARIABLE)" ')' @28 '{' inner_statement_list '}'
+   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 . "variable (T_VARIABLE)" ')' $@28 '{' inner_statement_list '}'
 
     "variable (T_VARIABLE)"  shift, and go to state 977
 
 
-state 977
+State 977
 
-   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" . ')' @28 '{' inner_statement_list '}'
+   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" . ')' $@28 '{' inner_statement_list '}'
 
     ')'  shift, and go to state 978
 
 
-state 978
+State 978
 
-   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' . @28 '{' inner_statement_list '}'
+   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' . $@28 '{' inner_statement_list '}'
 
-    $default  reduce using rule 89 (@28)
+    $default  reduce using rule 89 ($@28)
 
-    @28  go to state 979
+    $@28  go to state 979
 
 
-state 979
+State 979
 
-   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' @28 . '{' inner_statement_list '}'
+   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' $@28 . '{' inner_statement_list '}'
 
     '{'  shift, and go to state 980
 
 
-state 980
+State 980
 
-   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' @28 '{' . inner_statement_list '}'
+   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' $@28 '{' . inner_statement_list '}'
 
     $default  reduce using rule 28 (inner_statement_list)
 
     inner_statement_list  go to state 981
 
 
-state 981
+State 981
 
-   27 inner_statement_list: inner_statement_list . @4 inner_statement
-   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' @28 '{' inner_statement_list . '}'
+   27 inner_statement_list: inner_statement_list . $@4 inner_statement
+   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' $@28 '{' inner_statement_list . '}'
 
     '}'  shift, and go to state 982
 
-    $default  reduce using rule 26 (@4)
+    $default  reduce using rule 26 ($@4)
 
-    @4  go to state 366
+    $@4  go to state 366
 
 
-state 982
+State 982
 
-   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' @28 '{' inner_statement_list '}' .
+   90 additional_catch: "catch (T_CATCH)" '(' fully_qualified_class_name @27 "variable (T_VARIABLE)" ')' $@28 '{' inner_statement_list '}' .
 
     $default  reduce using rule 90 (additional_catch)
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 1f5d73296..bf48bb73d 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -41,17 +41,19 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 
 #define YYERROR_VERBOSE
 #define YYSTYPE znode
-#ifdef ZTS
-# define YYPARSE_PARAM tsrm_ls
-# define YYLEX_PARAM tsrm_ls
-#endif
-
 
 %}
 
 %pure_parser
 %expect 3
 
+%code requires {
+#ifdef ZTS
+# define YYPARSE_PARAM tsrm_ls
+# define YYLEX_PARAM tsrm_ls
+#endif
+}
+
 %token END 0 "end of file"
 %left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE
 %token T_INCLUDE      "include (T_INCLUDE)"
diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index 03cf334db..2b25ae7eb 100644
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Mar 27 23:52:29 2013 */
+/* Generated by re2c 0.13.5 on Sun Jun 16 14:52:22 2013 */
 #line 1 "Zend/zend_language_scanner.l"
 /*
    +----------------------------------------------------------------------+
@@ -258,6 +258,7 @@ ZEND_API void zend_restore_lexical_state(zend_lex_state *lex_state TSRMLS_DC)
 		CG(heredoc) = NULL;
 		CG(heredoc_len) = 0;
 	}
+	RESET_DOC_COMMENT();
 }
 
 ZEND_API void zend_destroy_file_handle(zend_file_handle *file_handle TSRMLS_DC)
@@ -541,6 +542,7 @@ ZEND_API int open_file_for_scanning(zend_file_handle *file_handle TSRMLS_DC)
 		CG(zend_lineno) = 1;
 	}
 
+	RESET_DOC_COMMENT();
 	CG(increment_lineno) = 0;
 	return SUCCESS;
 }
@@ -585,7 +587,7 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR
 		compiler_result = zendparse(TSRMLS_C);
 		zend_do_return(&retval_znode, 0 TSRMLS_CC);
 		CG(in_compilation) = original_in_compilation;
-		if (compiler_result==1) { /* parser error */
+		if (compiler_result != 0) { /* parser error */
 			zend_bailout();
 		}
 		compilation_successful=1;
@@ -691,6 +693,7 @@ ZEND_API int zend_prepare_string_for_scanning(zval *str, char *filename TSRMLS_D
 	zend_set_compiled_filename(filename TSRMLS_CC);
 	CG(zend_lineno) = 1;
 	CG(increment_lineno) = 0;
+	RESET_DOC_COMMENT();
 	return SUCCESS;
 }
 
@@ -760,7 +763,7 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC)
 			SCNG(script_filtered) = NULL;
 		}
 
-		if (compiler_result==1) {
+		if (compiler_result != 0) {
 			CG(active_op_array) = original_active_op_array;
 			CG(unclean_shutdown)=1;
 			destroy_op_array(op_array TSRMLS_CC);
@@ -1000,7 +1003,7 @@ restart:
 yymore_restart:
 
 
-#line 1004 "Zend/zend_language_scanner.c"
+#line 1007 "Zend/zend_language_scanner.c"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept = 0;
@@ -1099,7 +1102,7 @@ yyc_INITIAL:
 yy3:
 		YYDEBUG(3, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1792 "Zend/zend_language_scanner.l"
+#line 1795 "Zend/zend_language_scanner.l"
 		{
 	if (YYCURSOR > YYLIMIT) {
 		return 0;
@@ -1159,7 +1162,7 @@ inline_html:
 	HANDLE_NEWLINES(yytext, yyleng);
 	return T_INLINE_HTML;
 }
-#line 1163 "Zend/zend_language_scanner.c"
+#line 1166 "Zend/zend_language_scanner.c"
 yy4:
 		YYDEBUG(4, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1177,7 +1180,7 @@ yy5:
 yy6:
 		YYDEBUG(6, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1780 "Zend/zend_language_scanner.l"
+#line 1783 "Zend/zend_language_scanner.l"
 		{
 	if (CG(short_tags)) {
 		zendlval->value.str.val = yytext; /* no copying - intentional */
@@ -1189,14 +1192,14 @@ yy6:
 		goto inline_char_handler;
 	}
 }
-#line 1193 "Zend/zend_language_scanner.c"
+#line 1196 "Zend/zend_language_scanner.c"
 yy7:
 		YYDEBUG(7, *YYCURSOR);
 		++YYCURSOR;
 		if ((yych = *YYCURSOR) == '=') goto yy43;
 		YYDEBUG(8, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1757 "Zend/zend_language_scanner.l"
+#line 1760 "Zend/zend_language_scanner.l"
 		{
 	if (CG(asp_tags)) {
 		zendlval->value.str.val = yytext; /* no copying - intentional */
@@ -1208,7 +1211,7 @@ yy7:
 		goto inline_char_handler;
 	}
 }
-#line 1212 "Zend/zend_language_scanner.c"
+#line 1215 "Zend/zend_language_scanner.c"
 yy9:
 		YYDEBUG(9, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1394,7 +1397,7 @@ yy35:
 		++YYCURSOR;
 		YYDEBUG(38, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1717 "Zend/zend_language_scanner.l"
+#line 1720 "Zend/zend_language_scanner.l"
 		{
 	YYCTYPE *bracket = (YYCTYPE*)zend_memrchr(yytext, '<', yyleng - (sizeof("script language=php>") - 1));
 
@@ -1411,7 +1414,7 @@ yy35:
 	BEGIN(ST_IN_SCRIPTING);
 	return T_OPEN_TAG;
 }
-#line 1415 "Zend/zend_language_scanner.c"
+#line 1418 "Zend/zend_language_scanner.c"
 yy39:
 		YYDEBUG(39, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1438,7 +1441,7 @@ yy43:
 		++YYCURSOR;
 		YYDEBUG(44, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1735 "Zend/zend_language_scanner.l"
+#line 1738 "Zend/zend_language_scanner.l"
 		{
 	if (CG(asp_tags)) {
 		zendlval->value.str.val = yytext; /* no copying - intentional */
@@ -1450,13 +1453,13 @@ yy43:
 		goto inline_char_handler;
 	}
 }
-#line 1454 "Zend/zend_language_scanner.c"
+#line 1457 "Zend/zend_language_scanner.c"
 yy45:
 		YYDEBUG(45, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(46, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1748 "Zend/zend_language_scanner.l"
+#line 1751 "Zend/zend_language_scanner.l"
 		{
 	zendlval->value.str.val = yytext; /* no copying - intentional */
 	zendlval->value.str.len = yyleng;
@@ -1464,7 +1467,7 @@ yy45:
 	BEGIN(ST_IN_SCRIPTING);
 	return T_OPEN_TAG_WITH_ECHO;
 }
-#line 1468 "Zend/zend_language_scanner.c"
+#line 1471 "Zend/zend_language_scanner.c"
 yy47:
 		YYDEBUG(47, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1491,7 +1494,7 @@ yy50:
 yy51:
 		YYDEBUG(51, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1770 "Zend/zend_language_scanner.l"
+#line 1773 "Zend/zend_language_scanner.l"
 		{
 	zendlval->value.str.val = yytext; /* no copying - intentional */
 	zendlval->value.str.len = yyleng;
@@ -1500,7 +1503,7 @@ yy51:
 	BEGIN(ST_IN_SCRIPTING);
 	return T_OPEN_TAG;
 }
-#line 1504 "Zend/zend_language_scanner.c"
+#line 1507 "Zend/zend_language_scanner.c"
 yy52:
 		YYDEBUG(52, *YYCURSOR);
 		++YYCURSOR;
@@ -1571,7 +1574,7 @@ yyc_ST_BACKQUOTE:
 yy56:
 		YYDEBUG(56, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2243 "Zend/zend_language_scanner.l"
+#line 2246 "Zend/zend_language_scanner.l"
 		{
 	if (YYCURSOR > YYLIMIT) {
 		return 0;
@@ -1612,7 +1615,7 @@ yy56:
 	zend_scan_escape_string(zendlval, yytext, yyleng, '`' TSRMLS_CC);
 	return T_ENCAPSED_AND_WHITESPACE;
 }
-#line 1616 "Zend/zend_language_scanner.c"
+#line 1619 "Zend/zend_language_scanner.c"
 yy57:
 		YYDEBUG(57, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1623,12 +1626,12 @@ yy58:
 		++YYCURSOR;
 		YYDEBUG(59, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2187 "Zend/zend_language_scanner.l"
+#line 2190 "Zend/zend_language_scanner.l"
 		{
 	BEGIN(ST_IN_SCRIPTING);
 	return '`';
 }
-#line 1632 "Zend/zend_language_scanner.c"
+#line 1635 "Zend/zend_language_scanner.c"
 yy60:
 		YYDEBUG(60, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1638,14 +1641,14 @@ yy61:
 		++YYCURSOR;
 		YYDEBUG(62, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2174 "Zend/zend_language_scanner.l"
+#line 2177 "Zend/zend_language_scanner.l"
 		{
 	zendlval->value.lval = (long) '{';
 	yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
 	yyless(1);
 	return T_CURLY_OPEN;
 }
-#line 1649 "Zend/zend_language_scanner.c"
+#line 1652 "Zend/zend_language_scanner.c"
 yy63:
 		YYDEBUG(63, *YYCURSOR);
 		yyaccept = 0;
@@ -1661,24 +1664,24 @@ yy63:
 yy65:
 		YYDEBUG(65, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1874 "Zend/zend_language_scanner.l"
+#line 1877 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, (yytext+1), (yyleng-1));
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 1671 "Zend/zend_language_scanner.c"
+#line 1674 "Zend/zend_language_scanner.c"
 yy66:
 		YYDEBUG(66, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(67, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1451 "Zend/zend_language_scanner.l"
+#line 1454 "Zend/zend_language_scanner.l"
 		{
 	yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC);
 	return T_DOLLAR_OPEN_CURLY_BRACES;
 }
-#line 1682 "Zend/zend_language_scanner.c"
+#line 1685 "Zend/zend_language_scanner.c"
 yy68:
 		YYDEBUG(68, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1692,7 +1695,7 @@ yy70:
 		++YYCURSOR;
 		YYDEBUG(71, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1866 "Zend/zend_language_scanner.l"
+#line 1869 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 1);
 	yy_push_state(ST_VAR_OFFSET TSRMLS_CC);
@@ -1700,7 +1703,7 @@ yy70:
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 1704 "Zend/zend_language_scanner.c"
+#line 1707 "Zend/zend_language_scanner.c"
 yy72:
 		YYDEBUG(72, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1718,7 +1721,7 @@ yy73:
 		++YYCURSOR;
 		YYDEBUG(74, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1856 "Zend/zend_language_scanner.l"
+#line 1859 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 3);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC);
@@ -1726,7 +1729,7 @@ yy73:
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 1730 "Zend/zend_language_scanner.c"
+#line 1733 "Zend/zend_language_scanner.c"
 	}
 /* *********************************** */
 yyc_ST_DOUBLE_QUOTES:
@@ -1794,7 +1797,7 @@ yy77:
 yy78:
 		YYDEBUG(78, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2193 "Zend/zend_language_scanner.l"
+#line 2196 "Zend/zend_language_scanner.l"
 		{
 	if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) {
 		YYCURSOR += GET_DOUBLE_QUOTES_SCANNED_LENGTH() - 1;
@@ -1843,7 +1846,7 @@ double_quotes_scan_done:
 	zend_scan_escape_string(zendlval, yytext, yyleng, '"' TSRMLS_CC);
 	return T_ENCAPSED_AND_WHITESPACE;
 }
-#line 1847 "Zend/zend_language_scanner.c"
+#line 1850 "Zend/zend_language_scanner.c"
 yy79:
 		YYDEBUG(79, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1854,12 +1857,12 @@ yy80:
 		++YYCURSOR;
 		YYDEBUG(81, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2182 "Zend/zend_language_scanner.l"
+#line 2185 "Zend/zend_language_scanner.l"
 		{
 	BEGIN(ST_IN_SCRIPTING);
 	return '"';
 }
-#line 1863 "Zend/zend_language_scanner.c"
+#line 1866 "Zend/zend_language_scanner.c"
 yy82:
 		YYDEBUG(82, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1869,14 +1872,14 @@ yy83:
 		++YYCURSOR;
 		YYDEBUG(84, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2174 "Zend/zend_language_scanner.l"
+#line 2177 "Zend/zend_language_scanner.l"
 		{
 	zendlval->value.lval = (long) '{';
 	yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
 	yyless(1);
 	return T_CURLY_OPEN;
 }
-#line 1880 "Zend/zend_language_scanner.c"
+#line 1883 "Zend/zend_language_scanner.c"
 yy85:
 		YYDEBUG(85, *YYCURSOR);
 		yyaccept = 0;
@@ -1892,24 +1895,24 @@ yy85:
 yy87:
 		YYDEBUG(87, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1874 "Zend/zend_language_scanner.l"
+#line 1877 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, (yytext+1), (yyleng-1));
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 1902 "Zend/zend_language_scanner.c"
+#line 1905 "Zend/zend_language_scanner.c"
 yy88:
 		YYDEBUG(88, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(89, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1451 "Zend/zend_language_scanner.l"
+#line 1454 "Zend/zend_language_scanner.l"
 		{
 	yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC);
 	return T_DOLLAR_OPEN_CURLY_BRACES;
 }
-#line 1913 "Zend/zend_language_scanner.c"
+#line 1916 "Zend/zend_language_scanner.c"
 yy90:
 		YYDEBUG(90, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1923,7 +1926,7 @@ yy92:
 		++YYCURSOR;
 		YYDEBUG(93, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1866 "Zend/zend_language_scanner.l"
+#line 1869 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 1);
 	yy_push_state(ST_VAR_OFFSET TSRMLS_CC);
@@ -1931,7 +1934,7 @@ yy92:
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 1935 "Zend/zend_language_scanner.c"
+#line 1938 "Zend/zend_language_scanner.c"
 yy94:
 		YYDEBUG(94, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -1949,7 +1952,7 @@ yy95:
 		++YYCURSOR;
 		YYDEBUG(96, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1856 "Zend/zend_language_scanner.l"
+#line 1859 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 3);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC);
@@ -1957,7 +1960,7 @@ yy95:
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 1961 "Zend/zend_language_scanner.c"
+#line 1964 "Zend/zend_language_scanner.c"
 	}
 /* *********************************** */
 yyc_ST_END_HEREDOC:
@@ -1968,7 +1971,7 @@ yyc_ST_END_HEREDOC:
 	++YYCURSOR;
 	YYDEBUG(100, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
-#line 2161 "Zend/zend_language_scanner.l"
+#line 2164 "Zend/zend_language_scanner.l"
 	{
 	YYCURSOR += CG(heredoc_len) - 1;
 	yyleng = CG(heredoc_len);
@@ -1980,7 +1983,7 @@ yyc_ST_END_HEREDOC:
 	BEGIN(ST_IN_SCRIPTING);
 	return T_END_HEREDOC;
 }
-#line 1984 "Zend/zend_language_scanner.c"
+#line 1987 "Zend/zend_language_scanner.c"
 /* *********************************** */
 yyc_ST_HEREDOC:
 	{
@@ -2042,7 +2045,7 @@ yy103:
 yy104:
 		YYDEBUG(104, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2285 "Zend/zend_language_scanner.l"
+#line 2288 "Zend/zend_language_scanner.l"
 		{
 	int newline = 0;
 
@@ -2113,7 +2116,7 @@ heredoc_scan_done:
 	zend_scan_escape_string(zendlval, yytext, yyleng - newline, 0 TSRMLS_CC);
 	return T_ENCAPSED_AND_WHITESPACE;
 }
-#line 2117 "Zend/zend_language_scanner.c"
+#line 2120 "Zend/zend_language_scanner.c"
 yy105:
 		YYDEBUG(105, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -2128,14 +2131,14 @@ yy107:
 		++YYCURSOR;
 		YYDEBUG(108, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2174 "Zend/zend_language_scanner.l"
+#line 2177 "Zend/zend_language_scanner.l"
 		{
 	zendlval->value.lval = (long) '{';
 	yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
 	yyless(1);
 	return T_CURLY_OPEN;
 }
-#line 2139 "Zend/zend_language_scanner.c"
+#line 2142 "Zend/zend_language_scanner.c"
 yy109:
 		YYDEBUG(109, *YYCURSOR);
 		yyaccept = 0;
@@ -2151,24 +2154,24 @@ yy109:
 yy111:
 		YYDEBUG(111, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1874 "Zend/zend_language_scanner.l"
+#line 1877 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, (yytext+1), (yyleng-1));
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 2161 "Zend/zend_language_scanner.c"
+#line 2164 "Zend/zend_language_scanner.c"
 yy112:
 		YYDEBUG(112, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(113, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1451 "Zend/zend_language_scanner.l"
+#line 1454 "Zend/zend_language_scanner.l"
 		{
 	yy_push_state(ST_LOOKING_FOR_VARNAME TSRMLS_CC);
 	return T_DOLLAR_OPEN_CURLY_BRACES;
 }
-#line 2172 "Zend/zend_language_scanner.c"
+#line 2175 "Zend/zend_language_scanner.c"
 yy114:
 		YYDEBUG(114, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -2182,7 +2185,7 @@ yy116:
 		++YYCURSOR;
 		YYDEBUG(117, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1866 "Zend/zend_language_scanner.l"
+#line 1869 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 1);
 	yy_push_state(ST_VAR_OFFSET TSRMLS_CC);
@@ -2190,7 +2193,7 @@ yy116:
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 2194 "Zend/zend_language_scanner.c"
+#line 2197 "Zend/zend_language_scanner.c"
 yy118:
 		YYDEBUG(118, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -2208,7 +2211,7 @@ yy119:
 		++YYCURSOR;
 		YYDEBUG(120, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1856 "Zend/zend_language_scanner.l"
+#line 1859 "Zend/zend_language_scanner.l"
 		{
 	yyless(yyleng - 3);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC);
@@ -2216,7 +2219,7 @@ yy119:
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 2220 "Zend/zend_language_scanner.c"
+#line 2223 "Zend/zend_language_scanner.c"
 	}
 /* *********************************** */
 yyc_ST_IN_SCRIPTING:
@@ -2397,13 +2400,13 @@ yy123:
 yy124:
 		YYDEBUG(124, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1897 "Zend/zend_language_scanner.l"
+#line 1900 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, yytext, yyleng);
 	zendlval->type = IS_STRING;
 	return T_STRING;
 }
-#line 2407 "Zend/zend_language_scanner.c"
+#line 2410 "Zend/zend_language_scanner.c"
 yy125:
 		YYDEBUG(125, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -2629,11 +2632,11 @@ yy137:
 yy138:
 		YYDEBUG(138, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1440 "Zend/zend_language_scanner.l"
+#line 1443 "Zend/zend_language_scanner.l"
 		{
 	return yytext[0];
 }
-#line 2637 "Zend/zend_language_scanner.c"
+#line 2640 "Zend/zend_language_scanner.c"
 yy139:
 		YYDEBUG(139, *YYCURSOR);
 		++YYCURSOR;
@@ -2642,7 +2645,7 @@ yy139:
 yy140:
 		YYDEBUG(140, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1171 "Zend/zend_language_scanner.l"
+#line 1174 "Zend/zend_language_scanner.l"
 		{
 	zendlval->value.str.val = yytext; /* no copying - intentional */
 	zendlval->value.str.len = yyleng;
@@ -2650,7 +2653,7 @@ yy140:
 	HANDLE_NEWLINES(yytext, yyleng);
 	return T_WHITESPACE;
 }
-#line 2654 "Zend/zend_language_scanner.c"
+#line 2657 "Zend/zend_language_scanner.c"
 yy141:
 		YYDEBUG(141, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -2661,11 +2664,11 @@ yy142:
 		++YYCURSOR;
 		YYDEBUG(143, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1200 "Zend/zend_language_scanner.l"
+#line 1203 "Zend/zend_language_scanner.l"
 		{
 	return T_NS_SEPARATOR;
 }
-#line 2669 "Zend/zend_language_scanner.c"
+#line 2672 "Zend/zend_language_scanner.c"
 yy144:
 		YYDEBUG(144, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -2893,18 +2896,18 @@ yy167:
 		++YYCURSOR;
 		YYDEBUG(168, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1445 "Zend/zend_language_scanner.l"
+#line 1448 "Zend/zend_language_scanner.l"
 		{
 	yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
 	return '{';
 }
-#line 2902 "Zend/zend_language_scanner.c"
+#line 2905 "Zend/zend_language_scanner.c"
 yy169:
 		YYDEBUG(169, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(170, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1457 "Zend/zend_language_scanner.l"
+#line 1460 "Zend/zend_language_scanner.l"
 		{
 	RESET_DOC_COMMENT();
 	if (!zend_stack_is_empty(&SCNG(state_stack))) {
@@ -2912,7 +2915,7 @@ yy169:
 	}
 	return '}';
 }
-#line 2916 "Zend/zend_language_scanner.c"
+#line 2919 "Zend/zend_language_scanner.c"
 yy171:
 		YYDEBUG(171, *YYCURSOR);
 		yyaccept = 2;
@@ -2940,7 +2943,7 @@ yy171:
 yy172:
 		YYDEBUG(172, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1507 "Zend/zend_language_scanner.l"
+#line 1510 "Zend/zend_language_scanner.l"
 		{
 	if (yyleng < MAX_LENGTH_OF_LONG - 1) { /* Won't overflow */
 		zendlval->value.lval = strtol(yytext, NULL, 0);
@@ -2961,7 +2964,7 @@ yy172:
 	zendlval->type = IS_LONG;
 	return T_LNUMBER;
 }
-#line 2965 "Zend/zend_language_scanner.c"
+#line 2968 "Zend/zend_language_scanner.c"
 yy173:
 		YYDEBUG(173, *YYCURSOR);
 		yyaccept = 2;
@@ -2989,7 +2992,7 @@ yy175:
 yy176:
 		YYDEBUG(176, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1904 "Zend/zend_language_scanner.l"
+#line 1907 "Zend/zend_language_scanner.l"
 		{
 	while (YYCURSOR < YYLIMIT) {
 		switch (*YYCURSOR++) {
@@ -3023,14 +3026,14 @@ yy176:
 
 	return T_COMMENT;
 }
-#line 3027 "Zend/zend_language_scanner.c"
+#line 3030 "Zend/zend_language_scanner.c"
 yy177:
 		YYDEBUG(177, *YYCURSOR);
 		++YYCURSOR;
 yy178:
 		YYDEBUG(178, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1995 "Zend/zend_language_scanner.l"
+#line 1998 "Zend/zend_language_scanner.l"
 		{
 	register char *s, *t;
 	char *end;
@@ -3098,14 +3101,14 @@ yy178:
 	}
 	return T_CONSTANT_ENCAPSED_STRING;
 }
-#line 3102 "Zend/zend_language_scanner.c"
+#line 3105 "Zend/zend_language_scanner.c"
 yy179:
 		YYDEBUG(179, *YYCURSOR);
 		++YYCURSOR;
 yy180:
 		YYDEBUG(180, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2064 "Zend/zend_language_scanner.l"
+#line 2067 "Zend/zend_language_scanner.l"
 		{
 	int bprefix = (yytext[0] != '"') ? 1 : 0;
 
@@ -3146,24 +3149,24 @@ yy180:
 	BEGIN(ST_DOUBLE_QUOTES);
 	return '"';
 }
-#line 3150 "Zend/zend_language_scanner.c"
+#line 3153 "Zend/zend_language_scanner.c"
 yy181:
 		YYDEBUG(181, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(182, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2155 "Zend/zend_language_scanner.l"
+#line 2158 "Zend/zend_language_scanner.l"
 		{
 	BEGIN(ST_BACKQUOTE);
 	return '`';
 }
-#line 3161 "Zend/zend_language_scanner.c"
+#line 3164 "Zend/zend_language_scanner.c"
 yy183:
 		YYDEBUG(183, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(184, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2413 "Zend/zend_language_scanner.l"
+#line 2416 "Zend/zend_language_scanner.l"
 		{
 	if (YYCURSOR > YYLIMIT) {
 		return 0;
@@ -3172,7 +3175,7 @@ yy183:
 	zend_error(E_COMPILE_WARNING,"Unexpected character in input:  '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE);
 	goto restart;
 }
-#line 3176 "Zend/zend_language_scanner.c"
+#line 3179 "Zend/zend_language_scanner.c"
 yy185:
 		YYDEBUG(185, *YYCURSOR);
 		++YYCURSOR;
@@ -3199,13 +3202,13 @@ yy187:
 yy189:
 		YYDEBUG(189, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1572 "Zend/zend_language_scanner.l"
+#line 1575 "Zend/zend_language_scanner.l"
 		{
 	zendlval->value.dval = zend_strtod(yytext, NULL);
 	zendlval->type = IS_DOUBLE;
 	return T_DNUMBER;
 }
-#line 3209 "Zend/zend_language_scanner.c"
+#line 3212 "Zend/zend_language_scanner.c"
 yy190:
 		YYDEBUG(190, *YYCURSOR);
 		yyaccept = 2;
@@ -3297,7 +3300,7 @@ yy199:
 		}
 		YYDEBUG(201, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1482 "Zend/zend_language_scanner.l"
+#line 1485 "Zend/zend_language_scanner.l"
 		{
 	char *bin = yytext + 2; /* Skip "0b" */
 	int len = yyleng - 2;
@@ -3322,7 +3325,7 @@ yy199:
 		return T_DNUMBER;
 	}
 }
-#line 3326 "Zend/zend_language_scanner.c"
+#line 3329 "Zend/zend_language_scanner.c"
 yy202:
 		YYDEBUG(202, *YYCURSOR);
 		++YYCURSOR;
@@ -3334,7 +3337,7 @@ yy202:
 		}
 		YYDEBUG(204, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1528 "Zend/zend_language_scanner.l"
+#line 1531 "Zend/zend_language_scanner.l"
 		{
 	char *hex = yytext + 2; /* Skip "0x" */
 	int len = yyleng - 2;
@@ -3359,7 +3362,7 @@ yy202:
 		return T_DNUMBER;
 	}
 }
-#line 3363 "Zend/zend_language_scanner.c"
+#line 3366 "Zend/zend_language_scanner.c"
 yy205:
 		YYDEBUG(205, *YYCURSOR);
 		++YYCURSOR;
@@ -3368,7 +3371,7 @@ yy205:
 yy206:
 		YYDEBUG(206, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1972 "Zend/zend_language_scanner.l"
+#line 1975 "Zend/zend_language_scanner.l"
 		{
 	zendlval->value.str.val = yytext; /* no copying - intentional */
 	zendlval->value.str.len = yyleng;
@@ -3376,7 +3379,7 @@ yy206:
 	BEGIN(INITIAL);
 	return T_CLOSE_TAG;  /* implicit ';' at php-end tag */
 }
-#line 3380 "Zend/zend_language_scanner.c"
+#line 3383 "Zend/zend_language_scanner.c"
 yy207:
 		YYDEBUG(207, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -3410,13 +3413,13 @@ yy209:
 yy211:
 		YYDEBUG(211, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1874 "Zend/zend_language_scanner.l"
+#line 1877 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, (yytext+1), (yyleng-1));
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 3420 "Zend/zend_language_scanner.c"
+#line 3423 "Zend/zend_language_scanner.c"
 yy212:
 		YYDEBUG(212, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -3430,11 +3433,11 @@ yy213:
 		}
 		YYDEBUG(214, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1428 "Zend/zend_language_scanner.l"
+#line 1431 "Zend/zend_language_scanner.l"
 		{
 	return T_LOGICAL_XOR;
 }
-#line 3438 "Zend/zend_language_scanner.c"
+#line 3441 "Zend/zend_language_scanner.c"
 yy215:
 		YYDEBUG(215, *YYCURSOR);
 		++YYCURSOR;
@@ -3443,61 +3446,61 @@ yy215:
 		}
 		YYDEBUG(216, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1420 "Zend/zend_language_scanner.l"
+#line 1423 "Zend/zend_language_scanner.l"
 		{
 	return T_LOGICAL_OR;
 }
-#line 3451 "Zend/zend_language_scanner.c"
+#line 3454 "Zend/zend_language_scanner.c"
 yy217:
 		YYDEBUG(217, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(218, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1408 "Zend/zend_language_scanner.l"
+#line 1411 "Zend/zend_language_scanner.l"
 		{
 	return T_XOR_EQUAL;
 }
-#line 3461 "Zend/zend_language_scanner.c"
+#line 3464 "Zend/zend_language_scanner.c"
 yy219:
 		YYDEBUG(219, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(220, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1412 "Zend/zend_language_scanner.l"
+#line 1415 "Zend/zend_language_scanner.l"
 		{
 	return T_BOOLEAN_OR;
 }
-#line 3471 "Zend/zend_language_scanner.c"
+#line 3474 "Zend/zend_language_scanner.c"
 yy221:
 		YYDEBUG(221, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(222, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1404 "Zend/zend_language_scanner.l"
+#line 1407 "Zend/zend_language_scanner.l"
 		{
 	return T_OR_EQUAL;
 }
-#line 3481 "Zend/zend_language_scanner.c"
+#line 3484 "Zend/zend_language_scanner.c"
 yy223:
 		YYDEBUG(223, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(224, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1416 "Zend/zend_language_scanner.l"
+#line 1419 "Zend/zend_language_scanner.l"
 		{
 	return T_BOOLEAN_AND;
 }
-#line 3491 "Zend/zend_language_scanner.c"
+#line 3494 "Zend/zend_language_scanner.c"
 yy225:
 		YYDEBUG(225, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(226, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1400 "Zend/zend_language_scanner.l"
+#line 1403 "Zend/zend_language_scanner.l"
 		{
 	return T_AND_EQUAL;
 }
-#line 3501 "Zend/zend_language_scanner.c"
+#line 3504 "Zend/zend_language_scanner.c"
 yy227:
 		YYDEBUG(227, *YYCURSOR);
 		++YYCURSOR;
@@ -3506,7 +3509,7 @@ yy227:
 yy228:
 		YYDEBUG(228, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1981 "Zend/zend_language_scanner.l"
+#line 1984 "Zend/zend_language_scanner.l"
 		{
 	if (CG(asp_tags)) {
 		BEGIN(INITIAL);
@@ -3519,17 +3522,17 @@ yy228:
 		return yytext[0];
 	}
 }
-#line 3523 "Zend/zend_language_scanner.c"
+#line 3526 "Zend/zend_language_scanner.c"
 yy229:
 		YYDEBUG(229, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(230, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1388 "Zend/zend_language_scanner.l"
+#line 1391 "Zend/zend_language_scanner.l"
 		{
 	return T_MOD_EQUAL;
 }
-#line 3533 "Zend/zend_language_scanner.c"
+#line 3536 "Zend/zend_language_scanner.c"
 yy231:
 		YYDEBUG(231, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -3560,11 +3563,11 @@ yy235:
 		++YYCURSOR;
 		YYDEBUG(236, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1384 "Zend/zend_language_scanner.l"
+#line 1387 "Zend/zend_language_scanner.l"
 		{
 	return T_CONCAT_EQUAL;
 }
-#line 3568 "Zend/zend_language_scanner.c"
+#line 3571 "Zend/zend_language_scanner.c"
 yy237:
 		YYDEBUG(237, *YYCURSOR);
 		yyaccept = 4;
@@ -3573,7 +3576,7 @@ yy237:
 yy238:
 		YYDEBUG(238, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1938 "Zend/zend_language_scanner.l"
+#line 1941 "Zend/zend_language_scanner.l"
 		{
 	int doc_com;
 
@@ -3607,7 +3610,7 @@ yy238:
 
 	return T_COMMENT;
 }
-#line 3611 "Zend/zend_language_scanner.c"
+#line 3614 "Zend/zend_language_scanner.c"
 yy239:
 		YYDEBUG(239, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -3617,11 +3620,11 @@ yy240:
 		++YYCURSOR;
 		YYDEBUG(241, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1380 "Zend/zend_language_scanner.l"
+#line 1383 "Zend/zend_language_scanner.l"
 		{
 	return T_DIV_EQUAL;
 }
-#line 3625 "Zend/zend_language_scanner.c"
+#line 3628 "Zend/zend_language_scanner.c"
 yy242:
 		YYDEBUG(242, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -3644,42 +3647,42 @@ yy245:
 		++YYCURSOR;
 		YYDEBUG(246, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1376 "Zend/zend_language_scanner.l"
+#line 1379 "Zend/zend_language_scanner.l"
 		{
 	return T_MUL_EQUAL;
 }
-#line 3652 "Zend/zend_language_scanner.c"
+#line 3655 "Zend/zend_language_scanner.c"
 yy247:
 		YYDEBUG(247, *YYCURSOR);
 		++YYCURSOR;
 		if ((yych = *YYCURSOR) == '=') goto yy251;
 		YYDEBUG(248, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1436 "Zend/zend_language_scanner.l"
+#line 1439 "Zend/zend_language_scanner.l"
 		{
 	return T_SR;
 }
-#line 3663 "Zend/zend_language_scanner.c"
+#line 3666 "Zend/zend_language_scanner.c"
 yy249:
 		YYDEBUG(249, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(250, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1364 "Zend/zend_language_scanner.l"
+#line 1367 "Zend/zend_language_scanner.l"
 		{
 	return T_IS_GREATER_OR_EQUAL;
 }
-#line 3673 "Zend/zend_language_scanner.c"
+#line 3676 "Zend/zend_language_scanner.c"
 yy251:
 		YYDEBUG(251, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(252, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1396 "Zend/zend_language_scanner.l"
+#line 1399 "Zend/zend_language_scanner.l"
 		{
 	return T_SR_EQUAL;
 }
-#line 3683 "Zend/zend_language_scanner.c"
+#line 3686 "Zend/zend_language_scanner.c"
 yy253:
 		YYDEBUG(253, *YYCURSOR);
 		yyaccept = 5;
@@ -3690,11 +3693,11 @@ yy253:
 yy254:
 		YYDEBUG(254, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1432 "Zend/zend_language_scanner.l"
+#line 1435 "Zend/zend_language_scanner.l"
 		{
 	return T_SL;
 }
-#line 3698 "Zend/zend_language_scanner.c"
+#line 3701 "Zend/zend_language_scanner.c"
 yy255:
 		YYDEBUG(255, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -3706,22 +3709,22 @@ yy256:
 		++YYCURSOR;
 		YYDEBUG(257, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1360 "Zend/zend_language_scanner.l"
+#line 1363 "Zend/zend_language_scanner.l"
 		{
 	return T_IS_SMALLER_OR_EQUAL;
 }
-#line 3714 "Zend/zend_language_scanner.c"
+#line 3717 "Zend/zend_language_scanner.c"
 yy258:
 		YYDEBUG(258, *YYCURSOR);
 		++YYCURSOR;
 yy259:
 		YYDEBUG(259, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1356 "Zend/zend_language_scanner.l"
+#line 1359 "Zend/zend_language_scanner.l"
 		{
 	return T_IS_NOT_EQUAL;
 }
-#line 3725 "Zend/zend_language_scanner.c"
+#line 3728 "Zend/zend_language_scanner.c"
 yy260:
 		YYDEBUG(260, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -3772,11 +3775,11 @@ yy267:
 		++YYCURSOR;
 		YYDEBUG(268, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1392 "Zend/zend_language_scanner.l"
+#line 1395 "Zend/zend_language_scanner.l"
 		{
 	return T_SL_EQUAL;
 }
-#line 3780 "Zend/zend_language_scanner.c"
+#line 3783 "Zend/zend_language_scanner.c"
 yy269:
 		YYDEBUG(269, *YYCURSOR);
 		++YYCURSOR;
@@ -3881,7 +3884,7 @@ yy278:
 yy279:
 		YYDEBUG(279, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2106 "Zend/zend_language_scanner.l"
+#line 2109 "Zend/zend_language_scanner.l"
 		{
 	char *s;
 	int bprefix = (yytext[0] != '<') ? 1 : 0;
@@ -3929,7 +3932,7 @@ yy279:
 
 	return T_START_HEREDOC;
 }
-#line 3933 "Zend/zend_language_scanner.c"
+#line 3936 "Zend/zend_language_scanner.c"
 yy280:
 		YYDEBUG(280, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -3969,31 +3972,31 @@ yy283:
 		++YYCURSOR;
 		YYDEBUG(285, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1348 "Zend/zend_language_scanner.l"
+#line 1351 "Zend/zend_language_scanner.l"
 		{
 	return T_IS_NOT_IDENTICAL;
 }
-#line 3977 "Zend/zend_language_scanner.c"
+#line 3980 "Zend/zend_language_scanner.c"
 yy286:
 		YYDEBUG(286, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(287, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1368 "Zend/zend_language_scanner.l"
+#line 1371 "Zend/zend_language_scanner.l"
 		{
 	return T_PLUS_EQUAL;
 }
-#line 3987 "Zend/zend_language_scanner.c"
+#line 3990 "Zend/zend_language_scanner.c"
 yy288:
 		YYDEBUG(288, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(289, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1336 "Zend/zend_language_scanner.l"
+#line 1339 "Zend/zend_language_scanner.l"
 		{
 	return T_INC;
 }
-#line 3997 "Zend/zend_language_scanner.c"
+#line 4000 "Zend/zend_language_scanner.c"
 yy290:
 		YYDEBUG(290, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4012,42 +4015,42 @@ yy292:
 		}
 		YYDEBUG(293, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1324 "Zend/zend_language_scanner.l"
+#line 1327 "Zend/zend_language_scanner.l"
 		{
 	return T_LIST;
 }
-#line 4020 "Zend/zend_language_scanner.c"
+#line 4023 "Zend/zend_language_scanner.c"
 yy294:
 		YYDEBUG(294, *YYCURSOR);
 		++YYCURSOR;
 		if ((yych = *YYCURSOR) == '=') goto yy298;
 		YYDEBUG(295, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1352 "Zend/zend_language_scanner.l"
+#line 1355 "Zend/zend_language_scanner.l"
 		{
 	return T_IS_EQUAL;
 }
-#line 4031 "Zend/zend_language_scanner.c"
+#line 4034 "Zend/zend_language_scanner.c"
 yy296:
 		YYDEBUG(296, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(297, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1320 "Zend/zend_language_scanner.l"
+#line 1323 "Zend/zend_language_scanner.l"
 		{
 	return T_DOUBLE_ARROW;
 }
-#line 4041 "Zend/zend_language_scanner.c"
+#line 4044 "Zend/zend_language_scanner.c"
 yy298:
 		YYDEBUG(298, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(299, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1344 "Zend/zend_language_scanner.l"
+#line 1347 "Zend/zend_language_scanner.l"
 		{
 	return T_IS_IDENTICAL;
 }
-#line 4051 "Zend/zend_language_scanner.c"
+#line 4054 "Zend/zend_language_scanner.c"
 yy300:
 		YYDEBUG(300, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4177,7 +4180,7 @@ yy316:
 		}
 		YYDEBUG(319, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1707 "Zend/zend_language_scanner.l"
+#line 1710 "Zend/zend_language_scanner.l"
 		{
 	if (CG(current_namespace)) {
 		*zendlval = *CG(current_namespace);
@@ -4187,7 +4190,7 @@ yy316:
 	}
 	return T_NS_C;
 }
-#line 4191 "Zend/zend_language_scanner.c"
+#line 4194 "Zend/zend_language_scanner.c"
 yy320:
 		YYDEBUG(320, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4207,7 +4210,7 @@ yy321:
 		}
 		YYDEBUG(324, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1680 "Zend/zend_language_scanner.l"
+#line 1683 "Zend/zend_language_scanner.l"
 		{
 	char *filename = zend_get_compiled_filename(TSRMLS_C);
 	const size_t filename_len = strlen(filename);
@@ -4234,7 +4237,7 @@ yy321:
 	zendlval->type = IS_STRING;
 	return T_DIR;
 }
-#line 4238 "Zend/zend_language_scanner.c"
+#line 4241 "Zend/zend_language_scanner.c"
 yy325:
 		YYDEBUG(325, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4259,13 +4262,13 @@ yy327:
 		}
 		YYDEBUG(330, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1662 "Zend/zend_language_scanner.l"
+#line 1665 "Zend/zend_language_scanner.l"
 		{
 	zendlval->value.lval = CG(zend_lineno);
 	zendlval->type = IS_LONG;
 	return T_LINE;
 }
-#line 4269 "Zend/zend_language_scanner.c"
+#line 4272 "Zend/zend_language_scanner.c"
 yy331:
 		YYDEBUG(331, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4300,7 +4303,7 @@ yy335:
 		}
 		YYDEBUG(338, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1641 "Zend/zend_language_scanner.l"
+#line 1644 "Zend/zend_language_scanner.l"
 		{
 	const char *class_name = CG(active_class_entry) ? CG(active_class_entry)->name : NULL;
 	const char *func_name = CG(active_op_array)? CG(active_op_array)->function_name : NULL;
@@ -4321,7 +4324,7 @@ yy335:
 	zendlval->type = IS_STRING;
 	return T_METHOD_C;
 }
-#line 4325 "Zend/zend_language_scanner.c"
+#line 4328 "Zend/zend_language_scanner.c"
 yy339:
 		YYDEBUG(339, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4372,7 +4375,7 @@ yy346:
 		}
 		YYDEBUG(349, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1625 "Zend/zend_language_scanner.l"
+#line 1628 "Zend/zend_language_scanner.l"
 		{
 	const char *func_name = NULL;
 
@@ -4388,7 +4391,7 @@ yy346:
 	zendlval->type = IS_STRING;
 	return T_FUNC_C;
 }
-#line 4392 "Zend/zend_language_scanner.c"
+#line 4395 "Zend/zend_language_scanner.c"
 yy350:
 		YYDEBUG(350, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4408,7 +4411,7 @@ yy351:
 		}
 		YYDEBUG(354, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1668 "Zend/zend_language_scanner.l"
+#line 1671 "Zend/zend_language_scanner.l"
 		{
 	char *filename = zend_get_compiled_filename(TSRMLS_C);
 
@@ -4420,7 +4423,7 @@ yy351:
 	zendlval->type = IS_STRING;
 	return T_FILE;
 }
-#line 4424 "Zend/zend_language_scanner.c"
+#line 4427 "Zend/zend_language_scanner.c"
 yy355:
 		YYDEBUG(355, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4450,7 +4453,7 @@ yy358:
 		}
 		YYDEBUG(361, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1605 "Zend/zend_language_scanner.l"
+#line 1608 "Zend/zend_language_scanner.l"
 		{
 	const char *trait_name = NULL;
 	
@@ -4470,7 +4473,7 @@ yy358:
 	
 	return T_TRAIT_C;
 }
-#line 4474 "Zend/zend_language_scanner.c"
+#line 4477 "Zend/zend_language_scanner.c"
 yy362:
 		YYDEBUG(362, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4500,7 +4503,7 @@ yy365:
 		}
 		YYDEBUG(368, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1578 "Zend/zend_language_scanner.l"
+#line 1581 "Zend/zend_language_scanner.l"
 		{
 	const char *class_name = NULL;
 	
@@ -4527,7 +4530,7 @@ yy365:
 	}
 	return T_CLASS_C;
 }
-#line 4531 "Zend/zend_language_scanner.c"
+#line 4534 "Zend/zend_language_scanner.c"
 yy369:
 		YYDEBUG(369, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4589,11 +4592,11 @@ yy380:
 		}
 		YYDEBUG(381, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1288 "Zend/zend_language_scanner.l"
+#line 1291 "Zend/zend_language_scanner.l"
 		{
 	return T_HALT_COMPILER;
 }
-#line 4597 "Zend/zend_language_scanner.c"
+#line 4600 "Zend/zend_language_scanner.c"
 yy382:
 		YYDEBUG(382, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4613,11 +4616,11 @@ yy384:
 		}
 		YYDEBUG(385, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1268 "Zend/zend_language_scanner.l"
+#line 1271 "Zend/zend_language_scanner.l"
 		{
 	return T_USE;
 }
-#line 4621 "Zend/zend_language_scanner.c"
+#line 4624 "Zend/zend_language_scanner.c"
 yy386:
 		YYDEBUG(386, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4636,11 +4639,11 @@ yy388:
 		}
 		YYDEBUG(389, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1316 "Zend/zend_language_scanner.l"
+#line 1319 "Zend/zend_language_scanner.l"
 		{
 	return T_UNSET;
 }
-#line 4644 "Zend/zend_language_scanner.c"
+#line 4647 "Zend/zend_language_scanner.c"
 yy390:
 		YYDEBUG(390, *YYCURSOR);
 		++YYCURSOR;
@@ -4812,11 +4815,11 @@ yy405:
 		++YYCURSOR;
 		YYDEBUG(407, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1216 "Zend/zend_language_scanner.l"
+#line 1219 "Zend/zend_language_scanner.l"
 		{
 	return T_INT_CAST;
 }
-#line 4820 "Zend/zend_language_scanner.c"
+#line 4823 "Zend/zend_language_scanner.c"
 yy408:
 		YYDEBUG(408, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4860,11 +4863,11 @@ yy413:
 		++YYCURSOR;
 		YYDEBUG(416, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1220 "Zend/zend_language_scanner.l"
+#line 1223 "Zend/zend_language_scanner.l"
 		{
 	return T_DOUBLE_CAST;
 }
-#line 4868 "Zend/zend_language_scanner.c"
+#line 4871 "Zend/zend_language_scanner.c"
 yy417:
 		YYDEBUG(417, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4934,11 +4937,11 @@ yy427:
 		++YYCURSOR;
 		YYDEBUG(430, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1224 "Zend/zend_language_scanner.l"
+#line 1227 "Zend/zend_language_scanner.l"
 		{
 	return T_STRING_CAST;
 }
-#line 4942 "Zend/zend_language_scanner.c"
+#line 4945 "Zend/zend_language_scanner.c"
 yy431:
 		YYDEBUG(431, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -4971,11 +4974,11 @@ yy434:
 		++YYCURSOR;
 		YYDEBUG(437, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1228 "Zend/zend_language_scanner.l"
+#line 1231 "Zend/zend_language_scanner.l"
 		{
 	return T_ARRAY_CAST;
 }
-#line 4979 "Zend/zend_language_scanner.c"
+#line 4982 "Zend/zend_language_scanner.c"
 yy438:
 		YYDEBUG(438, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5013,11 +5016,11 @@ yy442:
 		++YYCURSOR;
 		YYDEBUG(445, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1232 "Zend/zend_language_scanner.l"
+#line 1235 "Zend/zend_language_scanner.l"
 		{
 	return T_OBJECT_CAST;
 }
-#line 5021 "Zend/zend_language_scanner.c"
+#line 5024 "Zend/zend_language_scanner.c"
 yy446:
 		YYDEBUG(446, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5058,11 +5061,11 @@ yy451:
 		++YYCURSOR;
 		YYDEBUG(453, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1236 "Zend/zend_language_scanner.l"
+#line 1239 "Zend/zend_language_scanner.l"
 		{
 	return T_BOOL_CAST;
 }
-#line 5066 "Zend/zend_language_scanner.c"
+#line 5069 "Zend/zend_language_scanner.c"
 yy454:
 		YYDEBUG(454, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5122,11 +5125,11 @@ yy462:
 		++YYCURSOR;
 		YYDEBUG(465, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1240 "Zend/zend_language_scanner.l"
+#line 1243 "Zend/zend_language_scanner.l"
 		{
 	return T_UNSET_CAST;
 }
-#line 5130 "Zend/zend_language_scanner.c"
+#line 5133 "Zend/zend_language_scanner.c"
 yy466:
 		YYDEBUG(466, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5140,11 +5143,11 @@ yy467:
 		}
 		YYDEBUG(468, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1212 "Zend/zend_language_scanner.l"
+#line 1215 "Zend/zend_language_scanner.l"
 		{
 	return T_VAR;
 }
-#line 5148 "Zend/zend_language_scanner.c"
+#line 5151 "Zend/zend_language_scanner.c"
 yy469:
 		YYDEBUG(469, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5164,11 +5167,11 @@ yy471:
 		}
 		YYDEBUG(472, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1204 "Zend/zend_language_scanner.l"
+#line 1207 "Zend/zend_language_scanner.l"
 		{
 	return T_NEW;
 }
-#line 5172 "Zend/zend_language_scanner.c"
+#line 5175 "Zend/zend_language_scanner.c"
 yy473:
 		YYDEBUG(473, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5207,21 +5210,21 @@ yy479:
 		}
 		YYDEBUG(480, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1264 "Zend/zend_language_scanner.l"
+#line 1267 "Zend/zend_language_scanner.l"
 		{
 	return T_NAMESPACE;
 }
-#line 5215 "Zend/zend_language_scanner.c"
+#line 5218 "Zend/zend_language_scanner.c"
 yy481:
 		YYDEBUG(481, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(482, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1196 "Zend/zend_language_scanner.l"
+#line 1199 "Zend/zend_language_scanner.l"
 		{
 	return T_PAAMAYIM_NEKUDOTAYIM;
 }
-#line 5225 "Zend/zend_language_scanner.c"
+#line 5228 "Zend/zend_language_scanner.c"
 yy483:
 		YYDEBUG(483, *YYCURSOR);
 		++YYCURSOR;
@@ -5243,32 +5246,32 @@ yy485:
 		++YYCURSOR;
 		YYDEBUG(486, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1372 "Zend/zend_language_scanner.l"
+#line 1375 "Zend/zend_language_scanner.l"
 		{
 	return T_MINUS_EQUAL;
 }
-#line 5251 "Zend/zend_language_scanner.c"
+#line 5254 "Zend/zend_language_scanner.c"
 yy487:
 		YYDEBUG(487, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(488, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1340 "Zend/zend_language_scanner.l"
+#line 1343 "Zend/zend_language_scanner.l"
 		{
 	return T_DEC;
 }
-#line 5261 "Zend/zend_language_scanner.c"
+#line 5264 "Zend/zend_language_scanner.c"
 yy489:
 		YYDEBUG(489, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(490, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1166 "Zend/zend_language_scanner.l"
+#line 1169 "Zend/zend_language_scanner.l"
 		{
 	yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC);
 	return T_OBJECT_OPERATOR;
 }
-#line 5272 "Zend/zend_language_scanner.c"
+#line 5275 "Zend/zend_language_scanner.c"
 yy491:
 		YYDEBUG(491, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5313,11 +5316,11 @@ yy496:
 		}
 		YYDEBUG(497, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1312 "Zend/zend_language_scanner.l"
+#line 1315 "Zend/zend_language_scanner.l"
 		{
 	return T_PUBLIC;
 }
-#line 5321 "Zend/zend_language_scanner.c"
+#line 5324 "Zend/zend_language_scanner.c"
 yy498:
 		YYDEBUG(498, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5372,11 +5375,11 @@ yy505:
 		}
 		YYDEBUG(506, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1308 "Zend/zend_language_scanner.l"
+#line 1311 "Zend/zend_language_scanner.l"
 		{
 	return T_PROTECTED;
 }
-#line 5380 "Zend/zend_language_scanner.c"
+#line 5383 "Zend/zend_language_scanner.c"
 yy507:
 		YYDEBUG(507, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5406,11 +5409,11 @@ yy511:
 		}
 		YYDEBUG(512, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1304 "Zend/zend_language_scanner.l"
+#line 1307 "Zend/zend_language_scanner.l"
 		{
 	return T_PRIVATE;
 }
-#line 5414 "Zend/zend_language_scanner.c"
+#line 5417 "Zend/zend_language_scanner.c"
 yy513:
 		YYDEBUG(513, *YYCURSOR);
 		++YYCURSOR;
@@ -5419,11 +5422,11 @@ yy513:
 		}
 		YYDEBUG(514, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1142 "Zend/zend_language_scanner.l"
+#line 1145 "Zend/zend_language_scanner.l"
 		{
 	return T_PRINT;
 }
-#line 5427 "Zend/zend_language_scanner.c"
+#line 5430 "Zend/zend_language_scanner.c"
 yy515:
 		YYDEBUG(515, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5448,11 +5451,11 @@ yy518:
 		}
 		YYDEBUG(519, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1134 "Zend/zend_language_scanner.l"
+#line 1137 "Zend/zend_language_scanner.l"
 		{
 	return T_GOTO;
 }
-#line 5456 "Zend/zend_language_scanner.c"
+#line 5459 "Zend/zend_language_scanner.c"
 yy520:
 		YYDEBUG(520, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5476,11 +5479,11 @@ yy523:
 		}
 		YYDEBUG(524, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1276 "Zend/zend_language_scanner.l"
+#line 1279 "Zend/zend_language_scanner.l"
 		{
 	return T_GLOBAL;
 }
-#line 5484 "Zend/zend_language_scanner.c"
+#line 5487 "Zend/zend_language_scanner.c"
 yy525:
 		YYDEBUG(525, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5517,11 +5520,11 @@ yy531:
 		}
 		YYDEBUG(532, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1126 "Zend/zend_language_scanner.l"
+#line 1129 "Zend/zend_language_scanner.l"
 		{
 	return T_BREAK;
 }
-#line 5525 "Zend/zend_language_scanner.c"
+#line 5528 "Zend/zend_language_scanner.c"
 yy533:
 		YYDEBUG(533, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5561,11 +5564,11 @@ yy539:
 		}
 		YYDEBUG(540, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1110 "Zend/zend_language_scanner.l"
+#line 1113 "Zend/zend_language_scanner.l"
 		{
 	return T_SWITCH;
 }
-#line 5569 "Zend/zend_language_scanner.c"
+#line 5572 "Zend/zend_language_scanner.c"
 yy541:
 		YYDEBUG(541, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5589,11 +5592,11 @@ yy544:
 		}
 		YYDEBUG(545, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1292 "Zend/zend_language_scanner.l"
+#line 1295 "Zend/zend_language_scanner.l"
 		{
 	return T_STATIC;
 }
-#line 5597 "Zend/zend_language_scanner.c"
+#line 5600 "Zend/zend_language_scanner.c"
 yy546:
 		YYDEBUG(546, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5620,11 +5623,11 @@ yy549:
 		}
 		YYDEBUG(550, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1106 "Zend/zend_language_scanner.l"
+#line 1109 "Zend/zend_language_scanner.l"
 		{
 	return T_AS;
 }
-#line 5628 "Zend/zend_language_scanner.c"
+#line 5631 "Zend/zend_language_scanner.c"
 yy551:
 		YYDEBUG(551, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5643,11 +5646,11 @@ yy553:
 		}
 		YYDEBUG(554, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1328 "Zend/zend_language_scanner.l"
+#line 1331 "Zend/zend_language_scanner.l"
 		{
 	return T_ARRAY;
 }
-#line 5651 "Zend/zend_language_scanner.c"
+#line 5654 "Zend/zend_language_scanner.c"
 yy555:
 		YYDEBUG(555, *YYCURSOR);
 		++YYCURSOR;
@@ -5656,11 +5659,11 @@ yy555:
 		}
 		YYDEBUG(556, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1424 "Zend/zend_language_scanner.l"
+#line 1427 "Zend/zend_language_scanner.l"
 		{
 	return T_LOGICAL_AND;
 }
-#line 5664 "Zend/zend_language_scanner.c"
+#line 5667 "Zend/zend_language_scanner.c"
 yy557:
 		YYDEBUG(557, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5694,11 +5697,11 @@ yy562:
 		}
 		YYDEBUG(563, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1296 "Zend/zend_language_scanner.l"
+#line 1299 "Zend/zend_language_scanner.l"
 		{
 	return T_ABSTRACT;
 }
-#line 5702 "Zend/zend_language_scanner.c"
+#line 5705 "Zend/zend_language_scanner.c"
 yy564:
 		YYDEBUG(564, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5722,11 +5725,11 @@ yy567:
 		}
 		YYDEBUG(568, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1066 "Zend/zend_language_scanner.l"
+#line 1069 "Zend/zend_language_scanner.l"
 		{
 	return T_WHILE;
 }
-#line 5730 "Zend/zend_language_scanner.c"
+#line 5733 "Zend/zend_language_scanner.c"
 yy569:
 		YYDEBUG(569, *YYCURSOR);
 		++YYCURSOR;
@@ -5735,11 +5738,11 @@ yy569:
 		}
 		YYDEBUG(570, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1050 "Zend/zend_language_scanner.l"
+#line 1053 "Zend/zend_language_scanner.l"
 		{
 	return T_IF;
 }
-#line 5743 "Zend/zend_language_scanner.c"
+#line 5746 "Zend/zend_language_scanner.c"
 yy571:
 		YYDEBUG(571, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5791,11 +5794,11 @@ yy576:
 		}
 		YYDEBUG(577, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1280 "Zend/zend_language_scanner.l"
+#line 1283 "Zend/zend_language_scanner.l"
 		{
 	return T_ISSET;
 }
-#line 5799 "Zend/zend_language_scanner.c"
+#line 5802 "Zend/zend_language_scanner.c"
 yy578:
 		YYDEBUG(578, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5849,11 +5852,11 @@ yy584:
 yy585:
 		YYDEBUG(585, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1248 "Zend/zend_language_scanner.l"
+#line 1251 "Zend/zend_language_scanner.l"
 		{
 	return T_INCLUDE;
 }
-#line 5857 "Zend/zend_language_scanner.c"
+#line 5860 "Zend/zend_language_scanner.c"
 yy586:
 		YYDEBUG(586, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5882,11 +5885,11 @@ yy590:
 		}
 		YYDEBUG(591, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1252 "Zend/zend_language_scanner.l"
+#line 1255 "Zend/zend_language_scanner.l"
 		{
 	return T_INCLUDE_ONCE;
 }
-#line 5890 "Zend/zend_language_scanner.c"
+#line 5893 "Zend/zend_language_scanner.c"
 yy592:
 		YYDEBUG(592, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5920,11 +5923,11 @@ yy597:
 		}
 		YYDEBUG(598, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1150 "Zend/zend_language_scanner.l"
+#line 1153 "Zend/zend_language_scanner.l"
 		{
 	return T_INTERFACE;
 }
-#line 5928 "Zend/zend_language_scanner.c"
+#line 5931 "Zend/zend_language_scanner.c"
 yy599:
 		YYDEBUG(599, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -5974,11 +5977,11 @@ yy605:
 		}
 		YYDEBUG(606, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1272 "Zend/zend_language_scanner.l"
+#line 1275 "Zend/zend_language_scanner.l"
 		{
         return T_INSTEADOF;
 }
-#line 5982 "Zend/zend_language_scanner.c"
+#line 5985 "Zend/zend_language_scanner.c"
 yy607:
 		YYDEBUG(607, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6007,11 +6010,11 @@ yy611:
 		}
 		YYDEBUG(612, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1102 "Zend/zend_language_scanner.l"
+#line 1105 "Zend/zend_language_scanner.l"
 		{
 	return T_INSTANCEOF;
 }
-#line 6015 "Zend/zend_language_scanner.c"
+#line 6018 "Zend/zend_language_scanner.c"
 yy613:
 		YYDEBUG(613, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6055,11 +6058,11 @@ yy620:
 		}
 		YYDEBUG(621, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1162 "Zend/zend_language_scanner.l"
+#line 1165 "Zend/zend_language_scanner.l"
 		{
 	return T_IMPLEMENTS;
 }
-#line 6063 "Zend/zend_language_scanner.c"
+#line 6066 "Zend/zend_language_scanner.c"
 yy622:
 		YYDEBUG(622, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6087,11 +6090,11 @@ yy623:
 		}
 		YYDEBUG(625, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1038 "Zend/zend_language_scanner.l"
+#line 1041 "Zend/zend_language_scanner.l"
 		{
 	return T_TRY;
 }
-#line 6095 "Zend/zend_language_scanner.c"
+#line 6098 "Zend/zend_language_scanner.c"
 yy626:
 		YYDEBUG(626, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6110,11 +6113,11 @@ yy628:
 		}
 		YYDEBUG(629, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1154 "Zend/zend_language_scanner.l"
+#line 1157 "Zend/zend_language_scanner.l"
 		{
 	return T_TRAIT;
 }
-#line 6118 "Zend/zend_language_scanner.c"
+#line 6121 "Zend/zend_language_scanner.c"
 yy630:
 		YYDEBUG(630, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6133,11 +6136,11 @@ yy632:
 		}
 		YYDEBUG(633, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1046 "Zend/zend_language_scanner.l"
+#line 1049 "Zend/zend_language_scanner.l"
 		{
 	return T_THROW;
 }
-#line 6141 "Zend/zend_language_scanner.c"
+#line 6144 "Zend/zend_language_scanner.c"
 yy634:
 		YYDEBUG(634, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6198,11 +6201,11 @@ yy640:
 yy641:
 		YYDEBUG(641, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1256 "Zend/zend_language_scanner.l"
+#line 1259 "Zend/zend_language_scanner.l"
 		{
 	return T_REQUIRE;
 }
-#line 6206 "Zend/zend_language_scanner.c"
+#line 6209 "Zend/zend_language_scanner.c"
 yy642:
 		YYDEBUG(642, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6231,11 +6234,11 @@ yy646:
 		}
 		YYDEBUG(647, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1260 "Zend/zend_language_scanner.l"
+#line 1263 "Zend/zend_language_scanner.l"
 		{
 	return T_REQUIRE_ONCE;
 }
-#line 6239 "Zend/zend_language_scanner.c"
+#line 6242 "Zend/zend_language_scanner.c"
 yy648:
 		YYDEBUG(648, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6254,11 +6257,11 @@ yy650:
 		}
 		YYDEBUG(651, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1034 "Zend/zend_language_scanner.l"
+#line 1037 "Zend/zend_language_scanner.l"
 		{
 	return T_RETURN;
 }
-#line 6262 "Zend/zend_language_scanner.c"
+#line 6265 "Zend/zend_language_scanner.c"
 yy652:
 		YYDEBUG(652, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6348,11 +6351,11 @@ yy661:
 		}
 		YYDEBUG(662, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1130 "Zend/zend_language_scanner.l"
+#line 1133 "Zend/zend_language_scanner.l"
 		{
 	return T_CONTINUE;
 }
-#line 6356 "Zend/zend_language_scanner.c"
+#line 6359 "Zend/zend_language_scanner.c"
 yy663:
 		YYDEBUG(663, *YYCURSOR);
 		++YYCURSOR;
@@ -6361,11 +6364,11 @@ yy663:
 		}
 		YYDEBUG(664, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1030 "Zend/zend_language_scanner.l"
+#line 1033 "Zend/zend_language_scanner.l"
 		{
 	return T_CONST;
 }
-#line 6369 "Zend/zend_language_scanner.c"
+#line 6372 "Zend/zend_language_scanner.c"
 yy665:
 		YYDEBUG(665, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6390,11 +6393,11 @@ yy668:
 		}
 		YYDEBUG(669, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1208 "Zend/zend_language_scanner.l"
+#line 1211 "Zend/zend_language_scanner.l"
 		{
 	return T_CLONE;
 }
-#line 6398 "Zend/zend_language_scanner.c"
+#line 6401 "Zend/zend_language_scanner.c"
 yy670:
 		YYDEBUG(670, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6408,11 +6411,11 @@ yy671:
 		}
 		YYDEBUG(672, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1146 "Zend/zend_language_scanner.l"
+#line 1149 "Zend/zend_language_scanner.l"
 		{
 	return T_CLASS;
 }
-#line 6416 "Zend/zend_language_scanner.c"
+#line 6419 "Zend/zend_language_scanner.c"
 yy673:
 		YYDEBUG(673, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6458,11 +6461,11 @@ yy680:
 		}
 		YYDEBUG(681, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1332 "Zend/zend_language_scanner.l"
+#line 1335 "Zend/zend_language_scanner.l"
 		{
  return T_CALLABLE;
 }
-#line 6466 "Zend/zend_language_scanner.c"
+#line 6469 "Zend/zend_language_scanner.c"
 yy682:
 		YYDEBUG(682, *YYCURSOR);
 		++YYCURSOR;
@@ -6471,11 +6474,11 @@ yy682:
 		}
 		YYDEBUG(683, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1118 "Zend/zend_language_scanner.l"
+#line 1121 "Zend/zend_language_scanner.l"
 		{
 	return T_CASE;
 }
-#line 6479 "Zend/zend_language_scanner.c"
+#line 6482 "Zend/zend_language_scanner.c"
 yy684:
 		YYDEBUG(684, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6489,11 +6492,11 @@ yy685:
 		}
 		YYDEBUG(686, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1042 "Zend/zend_language_scanner.l"
+#line 1045 "Zend/zend_language_scanner.l"
 		{
 	return T_CATCH;
 }
-#line 6497 "Zend/zend_language_scanner.c"
+#line 6500 "Zend/zend_language_scanner.c"
 yy687:
 		YYDEBUG(687, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6544,11 +6547,11 @@ yy695:
 		}
 		YYDEBUG(696, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1026 "Zend/zend_language_scanner.l"
+#line 1029 "Zend/zend_language_scanner.l"
 		{
 	return T_FUNCTION;
 }
-#line 6552 "Zend/zend_language_scanner.c"
+#line 6555 "Zend/zend_language_scanner.c"
 yy697:
 		YYDEBUG(697, *YYCURSOR);
 		++YYCURSOR;
@@ -6572,11 +6575,11 @@ yy697:
 yy698:
 		YYDEBUG(698, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1078 "Zend/zend_language_scanner.l"
+#line 1081 "Zend/zend_language_scanner.l"
 		{
 	return T_FOR;
 }
-#line 6580 "Zend/zend_language_scanner.c"
+#line 6583 "Zend/zend_language_scanner.c"
 yy699:
 		YYDEBUG(699, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6600,11 +6603,11 @@ yy702:
 		}
 		YYDEBUG(703, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1086 "Zend/zend_language_scanner.l"
+#line 1089 "Zend/zend_language_scanner.l"
 		{
 	return T_FOREACH;
 }
-#line 6608 "Zend/zend_language_scanner.c"
+#line 6611 "Zend/zend_language_scanner.c"
 yy704:
 		YYDEBUG(704, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6623,11 +6626,11 @@ yy706:
 		}
 		YYDEBUG(707, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1300 "Zend/zend_language_scanner.l"
+#line 1303 "Zend/zend_language_scanner.l"
 		{
 	return T_FINAL;
 }
-#line 6631 "Zend/zend_language_scanner.c"
+#line 6634 "Zend/zend_language_scanner.c"
 yy708:
 		YYDEBUG(708, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6658,11 +6661,11 @@ yy710:
 		}
 		YYDEBUG(711, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1074 "Zend/zend_language_scanner.l"
+#line 1077 "Zend/zend_language_scanner.l"
 		{
 	return T_DO;
 }
-#line 6666 "Zend/zend_language_scanner.c"
+#line 6669 "Zend/zend_language_scanner.c"
 yy712:
 		YYDEBUG(712, *YYCURSOR);
 		++YYCURSOR;
@@ -6671,11 +6674,11 @@ yy712:
 		}
 		YYDEBUG(713, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1022 "Zend/zend_language_scanner.l"
+#line 1025 "Zend/zend_language_scanner.l"
 		{
 	return T_EXIT;
 }
-#line 6679 "Zend/zend_language_scanner.c"
+#line 6682 "Zend/zend_language_scanner.c"
 yy714:
 		YYDEBUG(714, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6710,11 +6713,11 @@ yy719:
 		}
 		YYDEBUG(720, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1122 "Zend/zend_language_scanner.l"
+#line 1125 "Zend/zend_language_scanner.l"
 		{
 	return T_DEFAULT;
 }
-#line 6718 "Zend/zend_language_scanner.c"
+#line 6721 "Zend/zend_language_scanner.c"
 yy721:
 		YYDEBUG(721, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6738,11 +6741,11 @@ yy724:
 		}
 		YYDEBUG(725, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1094 "Zend/zend_language_scanner.l"
+#line 1097 "Zend/zend_language_scanner.l"
 		{
 	return T_DECLARE;
 }
-#line 6746 "Zend/zend_language_scanner.c"
+#line 6749 "Zend/zend_language_scanner.c"
 yy726:
 		YYDEBUG(726, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6822,11 +6825,11 @@ yy737:
 		}
 		YYDEBUG(738, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1158 "Zend/zend_language_scanner.l"
+#line 1161 "Zend/zend_language_scanner.l"
 		{
 	return T_EXTENDS;
 }
-#line 6830 "Zend/zend_language_scanner.c"
+#line 6833 "Zend/zend_language_scanner.c"
 yy739:
 		YYDEBUG(739, *YYCURSOR);
 		++YYCURSOR;
@@ -6835,11 +6838,11 @@ yy739:
 		}
 		YYDEBUG(740, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1018 "Zend/zend_language_scanner.l"
+#line 1021 "Zend/zend_language_scanner.l"
 		{
 	return T_EXIT;
 }
-#line 6843 "Zend/zend_language_scanner.c"
+#line 6846 "Zend/zend_language_scanner.c"
 yy741:
 		YYDEBUG(741, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6853,11 +6856,11 @@ yy742:
 		}
 		YYDEBUG(743, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1244 "Zend/zend_language_scanner.l"
+#line 1247 "Zend/zend_language_scanner.l"
 		{
 	return T_EVAL;
 }
-#line 6861 "Zend/zend_language_scanner.c"
+#line 6864 "Zend/zend_language_scanner.c"
 yy744:
 		YYDEBUG(744, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6927,11 +6930,11 @@ yy753:
 		}
 		YYDEBUG(754, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1070 "Zend/zend_language_scanner.l"
+#line 1073 "Zend/zend_language_scanner.l"
 		{
 	return T_ENDWHILE;
 }
-#line 6935 "Zend/zend_language_scanner.c"
+#line 6938 "Zend/zend_language_scanner.c"
 yy755:
 		YYDEBUG(755, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -6960,11 +6963,11 @@ yy759:
 		}
 		YYDEBUG(760, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1114 "Zend/zend_language_scanner.l"
+#line 1117 "Zend/zend_language_scanner.l"
 		{
 	return T_ENDSWITCH;
 }
-#line 6968 "Zend/zend_language_scanner.c"
+#line 6971 "Zend/zend_language_scanner.c"
 yy761:
 		YYDEBUG(761, *YYCURSOR);
 		++YYCURSOR;
@@ -6973,11 +6976,11 @@ yy761:
 		}
 		YYDEBUG(762, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1058 "Zend/zend_language_scanner.l"
+#line 1061 "Zend/zend_language_scanner.l"
 		{
 	return T_ENDIF;
 }
-#line 6981 "Zend/zend_language_scanner.c"
+#line 6984 "Zend/zend_language_scanner.c"
 yy763:
 		YYDEBUG(763, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7006,11 +7009,11 @@ yy764:
 yy765:
 		YYDEBUG(765, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1082 "Zend/zend_language_scanner.l"
+#line 1085 "Zend/zend_language_scanner.l"
 		{
 	return T_ENDFOR;
 }
-#line 7014 "Zend/zend_language_scanner.c"
+#line 7017 "Zend/zend_language_scanner.c"
 yy766:
 		YYDEBUG(766, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7034,11 +7037,11 @@ yy769:
 		}
 		YYDEBUG(770, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1090 "Zend/zend_language_scanner.l"
+#line 1093 "Zend/zend_language_scanner.l"
 		{
 	return T_ENDFOREACH;
 }
-#line 7042 "Zend/zend_language_scanner.c"
+#line 7045 "Zend/zend_language_scanner.c"
 yy771:
 		YYDEBUG(771, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7072,11 +7075,11 @@ yy776:
 		}
 		YYDEBUG(777, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1098 "Zend/zend_language_scanner.l"
+#line 1101 "Zend/zend_language_scanner.l"
 		{
 	return T_ENDDECLARE;
 }
-#line 7080 "Zend/zend_language_scanner.c"
+#line 7083 "Zend/zend_language_scanner.c"
 yy778:
 		YYDEBUG(778, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7095,11 +7098,11 @@ yy780:
 		}
 		YYDEBUG(781, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1284 "Zend/zend_language_scanner.l"
+#line 1287 "Zend/zend_language_scanner.l"
 		{
 	return T_EMPTY;
 }
-#line 7103 "Zend/zend_language_scanner.c"
+#line 7106 "Zend/zend_language_scanner.c"
 yy782:
 		YYDEBUG(782, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7128,11 +7131,11 @@ yy783:
 yy784:
 		YYDEBUG(784, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1062 "Zend/zend_language_scanner.l"
+#line 1065 "Zend/zend_language_scanner.l"
 		{
 	return T_ELSE;
 }
-#line 7136 "Zend/zend_language_scanner.c"
+#line 7139 "Zend/zend_language_scanner.c"
 yy785:
 		YYDEBUG(785, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7146,11 +7149,11 @@ yy786:
 		}
 		YYDEBUG(787, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1054 "Zend/zend_language_scanner.l"
+#line 1057 "Zend/zend_language_scanner.l"
 		{
 	return T_ELSEIF;
 }
-#line 7154 "Zend/zend_language_scanner.c"
+#line 7157 "Zend/zend_language_scanner.c"
 yy788:
 		YYDEBUG(788, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7164,11 +7167,11 @@ yy789:
 		}
 		YYDEBUG(790, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1138 "Zend/zend_language_scanner.l"
+#line 1141 "Zend/zend_language_scanner.l"
 		{
 	return T_ECHO;
 }
-#line 7172 "Zend/zend_language_scanner.c"
+#line 7175 "Zend/zend_language_scanner.c"
 	}
 /* *********************************** */
 yyc_ST_LOOKING_FOR_PROPERTY:
@@ -7241,7 +7244,7 @@ yy793:
 yy794:
 		YYDEBUG(794, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1171 "Zend/zend_language_scanner.l"
+#line 1174 "Zend/zend_language_scanner.l"
 		{
 	zendlval->value.str.val = yytext; /* no copying - intentional */
 	zendlval->value.str.len = yyleng;
@@ -7249,7 +7252,7 @@ yy794:
 	HANDLE_NEWLINES(yytext, yyleng);
 	return T_WHITESPACE;
 }
-#line 7253 "Zend/zend_language_scanner.c"
+#line 7256 "Zend/zend_language_scanner.c"
 yy795:
 		YYDEBUG(795, *YYCURSOR);
 		++YYCURSOR;
@@ -7257,13 +7260,13 @@ yy795:
 yy796:
 		YYDEBUG(796, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1190 "Zend/zend_language_scanner.l"
+#line 1193 "Zend/zend_language_scanner.l"
 		{
 	yyless(0);
 	yy_pop_state(TSRMLS_C);
 	goto restart;
 }
-#line 7267 "Zend/zend_language_scanner.c"
+#line 7270 "Zend/zend_language_scanner.c"
 yy797:
 		YYDEBUG(797, *YYCURSOR);
 		++YYCURSOR;
@@ -7272,14 +7275,14 @@ yy797:
 yy798:
 		YYDEBUG(798, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1183 "Zend/zend_language_scanner.l"
+#line 1186 "Zend/zend_language_scanner.l"
 		{
 	yy_pop_state(TSRMLS_C);
 	zend_copy_value(zendlval, yytext, yyleng);
 	zendlval->type = IS_STRING;
 	return T_STRING;
 }
-#line 7283 "Zend/zend_language_scanner.c"
+#line 7286 "Zend/zend_language_scanner.c"
 yy799:
 		YYDEBUG(799, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7300,11 +7303,11 @@ yy802:
 		++YYCURSOR;
 		YYDEBUG(803, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1179 "Zend/zend_language_scanner.l"
+#line 1182 "Zend/zend_language_scanner.l"
 		{
 	return T_OBJECT_OPERATOR;
 }
-#line 7308 "Zend/zend_language_scanner.c"
+#line 7311 "Zend/zend_language_scanner.c"
 yy804:
 		YYDEBUG(804, *YYCURSOR);
 		++YYCURSOR;
@@ -7374,7 +7377,7 @@ yy808:
 yy809:
 		YYDEBUG(809, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1466 "Zend/zend_language_scanner.l"
+#line 1469 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, yytext, yyleng);
 	zendlval->type = IS_STRING;
@@ -7382,20 +7385,20 @@ yy809:
 	yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
 	return T_STRING_VARNAME;
 }
-#line 7386 "Zend/zend_language_scanner.c"
+#line 7389 "Zend/zend_language_scanner.c"
 yy810:
 		YYDEBUG(810, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(811, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1475 "Zend/zend_language_scanner.l"
+#line 1478 "Zend/zend_language_scanner.l"
 		{
 	yyless(0);
 	yy_pop_state(TSRMLS_C);
 	yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
 	goto restart;
 }
-#line 7399 "Zend/zend_language_scanner.c"
+#line 7402 "Zend/zend_language_scanner.c"
 yy812:
 		YYDEBUG(812, *YYCURSOR);
 		++YYCURSOR;
@@ -7417,7 +7420,7 @@ yyc_ST_NOWDOC:
 	++YYCURSOR;
 	YYDEBUG(817, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
-#line 2357 "Zend/zend_language_scanner.l"
+#line 2360 "Zend/zend_language_scanner.l"
 	{
 	int newline = 0;
 
@@ -7472,7 +7475,7 @@ nowdoc_scan_done:
 	HANDLE_NEWLINES(yytext, yyleng - newline);
 	return T_ENCAPSED_AND_WHITESPACE;
 }
-#line 7476 "Zend/zend_language_scanner.c"
+#line 7479 "Zend/zend_language_scanner.c"
 /* *********************************** */
 yyc_ST_VAR_OFFSET:
 	{
@@ -7579,7 +7582,7 @@ yy820:
 yy821:
 		YYDEBUG(821, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1553 "Zend/zend_language_scanner.l"
+#line 1556 "Zend/zend_language_scanner.l"
 		{ /* Offset could be treated as a long */
 	if (yyleng < MAX_LENGTH_OF_LONG - 1 || (yyleng == MAX_LENGTH_OF_LONG - 1 && strcmp(yytext, long_min_digits) < 0)) {
 		zendlval->value.lval = strtol(yytext, NULL, 10);
@@ -7591,7 +7594,7 @@ yy821:
 	}
 	return T_NUM_STRING;
 }
-#line 7595 "Zend/zend_language_scanner.c"
+#line 7598 "Zend/zend_language_scanner.c"
 yy822:
 		YYDEBUG(822, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7611,23 +7614,23 @@ yy823:
 yy824:
 		YYDEBUG(824, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1885 "Zend/zend_language_scanner.l"
+#line 1888 "Zend/zend_language_scanner.l"
 		{
 	/* Only '[' can be valid, but returning other tokens will allow a more explicit parse error */
 	return yytext[0];
 }
-#line 7620 "Zend/zend_language_scanner.c"
+#line 7623 "Zend/zend_language_scanner.c"
 yy825:
 		YYDEBUG(825, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(826, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1880 "Zend/zend_language_scanner.l"
+#line 1883 "Zend/zend_language_scanner.l"
 		{
 	yy_pop_state(TSRMLS_C);
 	return ']';
 }
-#line 7631 "Zend/zend_language_scanner.c"
+#line 7634 "Zend/zend_language_scanner.c"
 yy827:
 		YYDEBUG(827, *YYCURSOR);
 		yych = *++YYCURSOR;
@@ -7637,14 +7640,14 @@ yy828:
 		++YYCURSOR;
 		YYDEBUG(829, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1890 "Zend/zend_language_scanner.l"
+#line 1893 "Zend/zend_language_scanner.l"
 		{
 	/* Invalid rule to return a more explicit parse error with proper line number */
 	yyless(0);
 	yy_pop_state(TSRMLS_C);
 	return T_ENCAPSED_AND_WHITESPACE;
 }
-#line 7648 "Zend/zend_language_scanner.c"
+#line 7651 "Zend/zend_language_scanner.c"
 yy830:
 		YYDEBUG(830, *YYCURSOR);
 		++YYCURSOR;
@@ -7653,19 +7656,19 @@ yy830:
 yy831:
 		YYDEBUG(831, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1897 "Zend/zend_language_scanner.l"
+#line 1900 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, yytext, yyleng);
 	zendlval->type = IS_STRING;
 	return T_STRING;
 }
-#line 7663 "Zend/zend_language_scanner.c"
+#line 7666 "Zend/zend_language_scanner.c"
 yy832:
 		YYDEBUG(832, *YYCURSOR);
 		++YYCURSOR;
 		YYDEBUG(833, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 2413 "Zend/zend_language_scanner.l"
+#line 2416 "Zend/zend_language_scanner.l"
 		{
 	if (YYCURSOR > YYLIMIT) {
 		return 0;
@@ -7674,7 +7677,7 @@ yy832:
 	zend_error(E_COMPILE_WARNING,"Unexpected character in input:  '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE);
 	goto restart;
 }
-#line 7678 "Zend/zend_language_scanner.c"
+#line 7681 "Zend/zend_language_scanner.c"
 yy834:
 		YYDEBUG(834, *YYCURSOR);
 		++YYCURSOR;
@@ -7710,13 +7713,13 @@ yy836:
 yy838:
 		YYDEBUG(838, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1874 "Zend/zend_language_scanner.l"
+#line 1877 "Zend/zend_language_scanner.l"
 		{
 	zend_copy_value(zendlval, (yytext+1), (yyleng-1));
 	zendlval->type = IS_STRING;
 	return T_VARIABLE;
 }
-#line 7720 "Zend/zend_language_scanner.c"
+#line 7723 "Zend/zend_language_scanner.c"
 yy839:
 		YYDEBUG(839, *YYCURSOR);
 		++YYCURSOR;
@@ -7756,14 +7759,14 @@ yy844:
 yy846:
 		YYDEBUG(846, *YYCURSOR);
 		yyleng = YYCURSOR - SCNG(yy_text);
-#line 1565 "Zend/zend_language_scanner.l"
+#line 1568 "Zend/zend_language_scanner.l"
 		{ /* Offset must be treated as a string */
 	zendlval->value.str.val = (char *)estrndup(yytext, yyleng);
 	zendlval->value.str.len = yyleng;
 	zendlval->type = IS_STRING;
 	return T_NUM_STRING;
 }
-#line 7767 "Zend/zend_language_scanner.c"
+#line 7770 "Zend/zend_language_scanner.c"
 yy847:
 		YYDEBUG(847, *YYCURSOR);
 		++YYCURSOR;
@@ -7786,6 +7789,6 @@ yy849:
 		goto yy846;
 	}
 }
-#line 2422 "Zend/zend_language_scanner.l"
+#line 2425 "Zend/zend_language_scanner.l"
 
 }
diff --git a/Zend/zend_language_scanner.h b/Zend/zend_language_scanner.h
index 826ad7aba..704547825 100644
--- a/Zend/zend_language_scanner.h
+++ b/Zend/zend_language_scanner.h
@@ -44,7 +44,7 @@ typedef struct _zend_lex_state {
 	unsigned char *script_filtered;
 	size_t script_filtered_size;
 
-	/* input/ouput filters */
+	/* input/output filters */
 	zend_encoding_filter input_filter;
 	zend_encoding_filter output_filter;
 	const zend_encoding *script_encoding;
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 97c938ebf..e70a3e1dc 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -256,6 +256,7 @@ ZEND_API void zend_restore_lexical_state(zend_lex_state *lex_state TSRMLS_DC)
 		CG(heredoc) = NULL;
 		CG(heredoc_len) = 0;
 	}
+	RESET_DOC_COMMENT();
 }
 
 ZEND_API void zend_destroy_file_handle(zend_file_handle *file_handle TSRMLS_DC)
@@ -539,6 +540,7 @@ ZEND_API int open_file_for_scanning(zend_file_handle *file_handle TSRMLS_DC)
 		CG(zend_lineno) = 1;
 	}
 
+	RESET_DOC_COMMENT();
 	CG(increment_lineno) = 0;
 	return SUCCESS;
 }
@@ -583,7 +585,7 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR
 		compiler_result = zendparse(TSRMLS_C);
 		zend_do_return(&retval_znode, 0 TSRMLS_CC);
 		CG(in_compilation) = original_in_compilation;
-		if (compiler_result==1) { /* parser error */
+		if (compiler_result != 0) { /* parser error */
 			zend_bailout();
 		}
 		compilation_successful=1;
@@ -689,6 +691,7 @@ ZEND_API int zend_prepare_string_for_scanning(zval *str, char *filename TSRMLS_D
 	zend_set_compiled_filename(filename TSRMLS_CC);
 	CG(zend_lineno) = 1;
 	CG(increment_lineno) = 0;
+	RESET_DOC_COMMENT();
 	return SUCCESS;
 }
 
@@ -758,7 +761,7 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC)
 			SCNG(script_filtered) = NULL;
 		}
 
-		if (compiler_result==1) {
+		if (compiler_result != 0) {
 			CG(active_op_array) = original_active_op_array;
 			CG(unclean_shutdown)=1;
 			destroy_op_array(op_array TSRMLS_CC);
diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h
index 2e9b5c653..5c30d3dd9 100644
--- a/Zend/zend_language_scanner_defs.h
+++ b/Zend/zend_language_scanner_defs.h
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Mar 27 23:52:29 2013 */
+/* Generated by re2c 0.13.5 on Sun Jun 16 14:52:22 2013 */
 #line 3 "Zend/zend_language_scanner_defs.h"
 
 enum YYCONDTYPE {
diff --git a/Zend/zend_multiply.h b/Zend/zend_multiply.h
index c3c9657f3..092d3cd0b 100644
--- a/Zend/zend_multiply.h
+++ b/Zend/zend_multiply.h
@@ -35,8 +35,8 @@
 
 #define ZEND_SIGNED_MULTIPLY_LONG(a, b, lval, dval, usedval) do {	\
 	long __tmpvar; 													\
-	__asm__ ("imulq %3,%0\n"										\
-		"adcq $0,%1" 												\
+	__asm__ ("imul %3,%0\n"											\
+		"adc $0,%1" 												\
 			: "=r"(__tmpvar),"=r"(usedval) 							\
 			: "0"(a), "r"(b), "1"(0));								\
 	if (usedval) (dval) = (double) (a) * (double) (b);				\
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index cc45d35ec..c2bb056a9 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -1278,6 +1278,14 @@ ZEND_API zval **zend_std_get_static_property(zend_class_entry *ce, const char *p
 		}
 	}
 
+	if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL) ||
+	    UNEXPECTED(CE_STATIC_MEMBERS(ce)[property_info->offset] == NULL)) {
+		if (!silent) {
+			zend_error_noreturn(E_ERROR, "Access to undeclared static property: %s::$%s", ce->name, property_name);
+		}
+		return NULL;
+	}
+	
 	return &CE_STATIC_MEMBERS(ce)[property_info->offset];
 }
 /* }}} */
diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c
index 1fe5d0c19..b5dd48f79 100644
--- a/Zend/zend_objects_API.c
+++ b/Zend/zend_objects_API.c
@@ -57,6 +57,11 @@ ZEND_API void zend_objects_store_call_destructors(zend_objects_store *objects TS
 					obj->dtor(obj->object, i TSRMLS_CC);
 					obj = &objects->object_buckets[i].bucket.obj;
 					obj->refcount--;
+
+					if (obj->refcount == 0) {
+						/* in case gc_collect_cycle is triggered before free_storage */
+						GC_REMOVE_ZOBJ_FROM_BUFFER(obj);
+					}
 				}
 			}
 		}
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index e673f0197..695b651a8 100644
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -162,8 +162,9 @@ static inline void cleanup_user_class_data(zend_class_entry *ce TSRMLS_DC)
 
 		for (i = 0; i < ce->default_static_members_count; i++) {
 			if (ce->static_members_table[i]) {
-				zval_ptr_dtor(&ce->static_members_table[i]);
+				zval *p = ce->static_members_table[i];
 				ce->static_members_table[i] = NULL;
+				zval_ptr_dtor(&p);
 			}
 		}
 		ce->static_members_table = NULL;
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 594f1f105..474f978a3 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -1475,7 +1475,7 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {
 				/* If both are objects sharing the same comparision handler then use is */
 				if (Z_OBJ_HANDLER_P(op1,compare_objects) == Z_OBJ_HANDLER_P(op2,compare_objects)) {
 					if (Z_OBJ_HANDLE_P(op1) == Z_OBJ_HANDLE_P(op2)) {
-						/* object handles are identical, apprently this is the same object */
+						/* object handles are identical, apparently this is the same object */
 						ZVAL_LONG(result, 0);
 						return SUCCESS;
 					}
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index eed65e3e2..f6c6e6ac5 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2229,9 +2229,11 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, CONST|VAR, CONST|TMP|VAR|UNUS
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
+			if (UNEXPECTED(EG(exception) != NULL)) {
+				HANDLE_EXCEPTION();
+			}
 			if (UNEXPECTED(ce == NULL)) {
-				CHECK_EXCEPTION();
-				ZEND_VM_NEXT_OPCODE();
+				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -2414,9 +2416,11 @@ ZEND_VM_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST|TMP|VAR|CV)
 
 			if (Z_TYPE_PP(obj) == IS_STRING) {
 				ce = zend_fetch_class_by_name(Z_STRVAL_PP(obj), Z_STRLEN_PP(obj), NULL, 0 TSRMLS_CC);
+				if (UNEXPECTED(EG(exception) != NULL)) {
+					HANDLE_EXCEPTION();
+				}
 				if (UNEXPECTED(ce == NULL)) {
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_PP(obj));
 				}
 				EX(called_scope) = ce;
 				EX(object) = NULL;
@@ -2684,6 +2688,8 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)
 			if (!RETURN_VALUE_USED(opline)) {
 				zval_ptr_dtor(&ret->var.ptr);
 			}
+		} else if (RETURN_VALUE_USED(opline)) {
+			EX_T(opline->result.var).var.ptr = NULL;
 		}
 	} else if (fbc->type == ZEND_USER_FUNCTION) {
 		EX(original_return_value) = EG(return_value_ptr_ptr);
@@ -2904,9 +2910,12 @@ ZEND_VM_HANDLER(111, ZEND_RETURN_BY_REF, CONST|TMP|VAR|CV, ANY)
 			} else if (EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) {
 				zend_error(E_NOTICE, "Only variable references should be returned by reference");
 				if (EG(return_value_ptr_ptr)) {
-					retval_ptr = *retval_ptr_ptr;
-					*EG(return_value_ptr_ptr) = retval_ptr;
-					Z_ADDREF_P(retval_ptr);
+					zval *ret;
+
+					ALLOC_ZVAL(ret);
+					INIT_PZVAL_COPY(ret, *retval_ptr_ptr);
+					zval_copy_ctor(ret);
+					*EG(return_value_ptr_ptr) = ret;
 				}
 				break;
 			}
@@ -2975,7 +2984,7 @@ ZEND_VM_HANDLER(107, ZEND_CATCH, CONST, CV)
 
 #ifdef HAVE_DTRACE
 	if (DTRACE_EXCEPTION_CAUGHT_ENABLED()) {
-		DTRACE_EXCEPTION_CAUGHT(ce->name);
+		DTRACE_EXCEPTION_CAUGHT((char *)ce->name);
 	}
 #endif /* HAVE_DTRACE */
 
@@ -3266,7 +3275,6 @@ ZEND_VM_HANDLER(50, ZEND_BRK, ANY, CONST)
 	SAVE_OPLINE();
 	el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num,
 	                   EX(op_array), EX_Ts() TSRMLS_CC);
-	FREE_OP2();
 	ZEND_VM_JMP(EX(op_array)->opcodes + el->brk);
 }
 
@@ -3278,7 +3286,6 @@ ZEND_VM_HANDLER(51, ZEND_CONT, ANY, CONST)
 	SAVE_OPLINE();
 	el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num,
 	                   EX(op_array), EX_Ts() TSRMLS_CC);
-	FREE_OP2();
 	ZEND_VM_JMP(EX(op_array)->opcodes + el->cont);
 }
 
@@ -3498,9 +3505,11 @@ ZEND_VM_HANDLER(99, ZEND_FETCH_CONSTANT, VAR|CONST|UNUSED, CONST)
 				ce = CACHED_PTR(opline->op1.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
+				if (UNEXPECTED(EG(exception) != NULL)) {
+					HANDLE_EXCEPTION();
+				}
 				if (UNEXPECTED(ce == NULL)) {
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
 				}
 				CACHE_PTR(opline->op1.literal->cache_slot, ce);
 			}
@@ -3887,15 +3896,17 @@ ZEND_VM_HANDLER(74, ZEND_UNSET_VAR, CONST|TMP|VAR|CV, UNUSED|CONST|VAR)
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(ce == NULL)) {
+				if (UNEXPECTED(EG(exception) != NULL)) {
 					if (OP1_TYPE != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (OP1_TYPE == IS_VAR || OP1_TYPE == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 					FREE_OP1();
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					HANDLE_EXCEPTION();
+				}
+				if (UNEXPECTED(ce == NULL)) {
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 18b3f4772..64d4320f9 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -648,6 +648,8 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR
 			if (!RETURN_VALUE_USED(opline)) {
 				zval_ptr_dtor(&ret->var.ptr);
 			}
+		} else if (RETURN_VALUE_USED(opline)) {
+			EX_T(opline->result.var).var.ptr = NULL;
 		}
 	} else if (fbc->type == ZEND_USER_FUNCTION) {
 		EX(original_return_value) = EG(return_value_ptr_ptr);
@@ -1272,9 +1274,11 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_CONST_HANDLER(ZEND_OPCODE
 
 			if (Z_TYPE_PP(obj) == IS_STRING) {
 				ce = zend_fetch_class_by_name(Z_STRVAL_PP(obj), Z_STRLEN_PP(obj), NULL, 0 TSRMLS_CC);
+				if (UNEXPECTED(EG(exception) != NULL)) {
+					HANDLE_EXCEPTION();
+				}
 				if (UNEXPECTED(ce == NULL)) {
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_PP(obj));
 				}
 				EX(called_scope) = ce;
 				EX(object) = NULL;
@@ -1389,7 +1393,6 @@ static int ZEND_FASTCALL  ZEND_BRK_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 	SAVE_OPLINE();
 	el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num,
 	                   EX(op_array), EX_Ts() TSRMLS_CC);
-
 	ZEND_VM_JMP(EX(op_array)->opcodes + el->brk);
 }
 
@@ -1401,7 +1404,6 @@ static int ZEND_FASTCALL  ZEND_CONT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 	SAVE_OPLINE();
 	el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num,
 	                   EX(op_array), EX_Ts() TSRMLS_CC);
-
 	ZEND_VM_JMP(EX(op_array)->opcodes + el->cont);
 }
 
@@ -1578,9 +1580,11 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_TMP_HANDLER(ZEND_OPCODE_H
 
 			if (Z_TYPE_PP(obj) == IS_STRING) {
 				ce = zend_fetch_class_by_name(Z_STRVAL_PP(obj), Z_STRLEN_PP(obj), NULL, 0 TSRMLS_CC);
+				if (UNEXPECTED(EG(exception) != NULL)) {
+					HANDLE_EXCEPTION();
+				}
 				if (UNEXPECTED(ce == NULL)) {
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_PP(obj));
 				}
 				EX(called_scope) = ce;
 				EX(object) = NULL;
@@ -1746,9 +1750,11 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_VAR_HANDLER(ZEND_OPCODE_H
 
 			if (Z_TYPE_PP(obj) == IS_STRING) {
 				ce = zend_fetch_class_by_name(Z_STRVAL_PP(obj), Z_STRLEN_PP(obj), NULL, 0 TSRMLS_CC);
+				if (UNEXPECTED(EG(exception) != NULL)) {
+					HANDLE_EXCEPTION();
+				}
 				if (UNEXPECTED(ce == NULL)) {
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_PP(obj));
 				}
 				EX(called_scope) = ce;
 				EX(object) = NULL;
@@ -1947,9 +1953,11 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_CV_HANDLER(ZEND_OPCODE_HA
 
 			if (Z_TYPE_PP(obj) == IS_STRING) {
 				ce = zend_fetch_class_by_name(Z_STRVAL_PP(obj), Z_STRLEN_PP(obj), NULL, 0 TSRMLS_CC);
+				if (UNEXPECTED(EG(exception) != NULL)) {
+					HANDLE_EXCEPTION();
+				}
 				if (UNEXPECTED(ce == NULL)) {
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_PP(obj));
 				}
 				EX(called_scope) = ce;
 				EX(object) = NULL;
@@ -2316,9 +2324,12 @@ static int ZEND_FASTCALL  ZEND_RETURN_BY_REF_SPEC_CONST_HANDLER(ZEND_OPCODE_HAND
 			} else if (EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) {
 				zend_error(E_NOTICE, "Only variable references should be returned by reference");
 				if (EG(return_value_ptr_ptr)) {
-					retval_ptr = *retval_ptr_ptr;
-					*EG(return_value_ptr_ptr) = retval_ptr;
-					Z_ADDREF_P(retval_ptr);
+					zval *ret;
+
+					ALLOC_ZVAL(ret);
+					INIT_PZVAL_COPY(ret, *retval_ptr_ptr);
+					zval_copy_ctor(ret);
+					*EG(return_value_ptr_ptr) = ret;
 				}
 				break;
 			}
@@ -3419,9 +3430,11 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CONST_HANDLER(
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
+			if (UNEXPECTED(EG(exception) != NULL)) {
+				HANDLE_EXCEPTION();
+			}
 			if (UNEXPECTED(ce == NULL)) {
-				CHECK_EXCEPTION();
-				ZEND_VM_NEXT_OPCODE();
+				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -3588,9 +3601,11 @@ static int ZEND_FASTCALL  ZEND_FETCH_CONSTANT_SPEC_CONST_CONST_HANDLER(ZEND_OPCO
 				ce = CACHED_PTR(opline->op1.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
+				if (UNEXPECTED(EG(exception) != NULL)) {
+					HANDLE_EXCEPTION();
+				}
 				if (UNEXPECTED(ce == NULL)) {
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
 				}
 				CACHE_PTR(opline->op1.literal->cache_slot, ce);
 			}
@@ -3772,15 +3787,17 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HA
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(ce == NULL)) {
+				if (UNEXPECTED(EG(exception) != NULL)) {
 					if (IS_CONST != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_CONST == IS_VAR || IS_CONST == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					HANDLE_EXCEPTION();
+				}
+				if (UNEXPECTED(ce == NULL)) {
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -4221,9 +4238,11 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_TMP_HANDLER(ZE
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
+			if (UNEXPECTED(EG(exception) != NULL)) {
+				HANDLE_EXCEPTION();
+			}
 			if (UNEXPECTED(ce == NULL)) {
-				CHECK_EXCEPTION();
-				ZEND_VM_NEXT_OPCODE();
+				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -4895,9 +4914,11 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_VAR_HANDLER(ZE
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
+			if (UNEXPECTED(EG(exception) != NULL)) {
+				HANDLE_EXCEPTION();
+			}
 			if (UNEXPECTED(ce == NULL)) {
-				CHECK_EXCEPTION();
-				ZEND_VM_NEXT_OPCODE();
+				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -5157,15 +5178,17 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HAND
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(ce == NULL)) {
+				if (UNEXPECTED(EG(exception) != NULL)) {
 					if (IS_CONST != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_CONST == IS_VAR || IS_CONST == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					HANDLE_EXCEPTION();
+				}
+				if (UNEXPECTED(ce == NULL)) {
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -5454,9 +5477,11 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_UNUSED_HANDLER
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
+			if (UNEXPECTED(EG(exception) != NULL)) {
+				HANDLE_EXCEPTION();
+			}
 			if (UNEXPECTED(ce == NULL)) {
-				CHECK_EXCEPTION();
-				ZEND_VM_NEXT_OPCODE();
+				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -5698,15 +5723,17 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_H
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(ce == NULL)) {
+				if (UNEXPECTED(EG(exception) != NULL)) {
 					if (IS_CONST != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_CONST == IS_VAR || IS_CONST == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					HANDLE_EXCEPTION();
+				}
+				if (UNEXPECTED(ce == NULL)) {
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -6125,9 +6152,11 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CV_HANDLER(ZEN
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
+			if (UNEXPECTED(EG(exception) != NULL)) {
+				HANDLE_EXCEPTION();
+			}
 			if (UNEXPECTED(ce == NULL)) {
-				CHECK_EXCEPTION();
-				ZEND_VM_NEXT_OPCODE();
+				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -6250,7 +6279,7 @@ static int ZEND_FASTCALL  ZEND_CATCH_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_A
 
 #ifdef HAVE_DTRACE
 	if (DTRACE_EXCEPTION_CAUGHT_ENABLED()) {
-		DTRACE_EXCEPTION_CAUGHT(ce->name);
+		DTRACE_EXCEPTION_CAUGHT((char *)ce->name);
 	}
 #endif /* HAVE_DTRACE */
 
@@ -6717,9 +6746,12 @@ static int ZEND_FASTCALL  ZEND_RETURN_BY_REF_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLE
 			} else if (EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) {
 				zend_error(E_NOTICE, "Only variable references should be returned by reference");
 				if (EG(return_value_ptr_ptr)) {
-					retval_ptr = *retval_ptr_ptr;
-					*EG(return_value_ptr_ptr) = retval_ptr;
-					Z_ADDREF_P(retval_ptr);
+					zval *ret;
+
+					ALLOC_ZVAL(ret);
+					INIT_PZVAL_COPY(ret, *retval_ptr_ptr);
+					zval_copy_ctor(ret);
+					*EG(return_value_ptr_ptr) = ret;
 				}
 				break;
 			}
@@ -8134,15 +8166,17 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HAND
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(ce == NULL)) {
+				if (UNEXPECTED(EG(exception) != NULL)) {
 					if (IS_TMP_VAR != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_TMP_VAR == IS_VAR || IS_TMP_VAR == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 					zval_dtor(free_op1.var);
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					HANDLE_EXCEPTION();
+				}
+				if (UNEXPECTED(ce == NULL)) {
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -9479,15 +9513,17 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLE
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(ce == NULL)) {
+				if (UNEXPECTED(EG(exception) != NULL)) {
 					if (IS_TMP_VAR != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_TMP_VAR == IS_VAR || IS_TMP_VAR == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 					zval_dtor(free_op1.var);
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					HANDLE_EXCEPTION();
+				}
+				if (UNEXPECTED(ce == NULL)) {
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -9904,15 +9940,17 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_TMP_UNUSED_HANDLER(ZEND_OPCODE_HAN
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(ce == NULL)) {
+				if (UNEXPECTED(EG(exception) != NULL)) {
 					if (IS_TMP_VAR != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_TMP_VAR == IS_VAR || IS_TMP_VAR == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 					zval_dtor(free_op1.var);
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					HANDLE_EXCEPTION();
+				}
+				if (UNEXPECTED(ce == NULL)) {
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -11023,9 +11061,12 @@ static int ZEND_FASTCALL  ZEND_RETURN_BY_REF_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLE
 			} else if (EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) {
 				zend_error(E_NOTICE, "Only variable references should be returned by reference");
 				if (EG(return_value_ptr_ptr)) {
-					retval_ptr = *retval_ptr_ptr;
-					*EG(return_value_ptr_ptr) = retval_ptr;
-					Z_ADDREF_P(retval_ptr);
+					zval *ret;
+
+					ALLOC_ZVAL(ret);
+					INIT_PZVAL_COPY(ret, *retval_ptr_ptr);
+					zval_copy_ctor(ret);
+					*EG(return_value_ptr_ptr) = ret;
 				}
 				break;
 			}
@@ -13492,9 +13533,11 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZE
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
+			if (UNEXPECTED(EG(exception) != NULL)) {
+				HANDLE_EXCEPTION();
+			}
 			if (UNEXPECTED(ce == NULL)) {
-				CHECK_EXCEPTION();
-				ZEND_VM_NEXT_OPCODE();
+				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -13661,9 +13704,11 @@ static int ZEND_FASTCALL  ZEND_FETCH_CONSTANT_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE
 				ce = CACHED_PTR(opline->op1.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
+				if (UNEXPECTED(EG(exception) != NULL)) {
+					HANDLE_EXCEPTION();
+				}
 				if (UNEXPECTED(ce == NULL)) {
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
 				}
 				CACHE_PTR(opline->op1.literal->cache_slot, ce);
 			}
@@ -13845,15 +13890,17 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HAND
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(ce == NULL)) {
+				if (UNEXPECTED(EG(exception) != NULL)) {
 					if (IS_VAR != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_VAR == IS_VAR || IS_VAR == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 					if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					HANDLE_EXCEPTION();
+				}
+				if (UNEXPECTED(ce == NULL)) {
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -15662,9 +15709,11 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
+			if (UNEXPECTED(EG(exception) != NULL)) {
+				HANDLE_EXCEPTION();
+			}
 			if (UNEXPECTED(ce == NULL)) {
-				CHECK_EXCEPTION();
-				ZEND_VM_NEXT_OPCODE();
+				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -17799,9 +17848,11 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
+			if (UNEXPECTED(EG(exception) != NULL)) {
+				HANDLE_EXCEPTION();
+			}
 			if (UNEXPECTED(ce == NULL)) {
-				CHECK_EXCEPTION();
-				ZEND_VM_NEXT_OPCODE();
+				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -18061,15 +18112,17 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLE
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(ce == NULL)) {
+				if (UNEXPECTED(EG(exception) != NULL)) {
 					if (IS_VAR != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_VAR == IS_VAR || IS_VAR == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 					if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					HANDLE_EXCEPTION();
+				}
+				if (UNEXPECTED(ce == NULL)) {
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -19075,9 +19128,11 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_UNUSED_HANDLER(Z
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
+			if (UNEXPECTED(EG(exception) != NULL)) {
+				HANDLE_EXCEPTION();
+			}
 			if (UNEXPECTED(ce == NULL)) {
-				CHECK_EXCEPTION();
-				ZEND_VM_NEXT_OPCODE();
+				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -19319,15 +19374,17 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HAN
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(ce == NULL)) {
+				if (UNEXPECTED(EG(exception) != NULL)) {
 					if (IS_VAR != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_VAR == IS_VAR || IS_VAR == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 					if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					HANDLE_EXCEPTION();
+				}
+				if (UNEXPECTED(ce == NULL)) {
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -20912,9 +20969,11 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_
 			ce = CACHED_PTR(opline->op1.literal->cache_slot);
 		} else {
 			ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
+			if (UNEXPECTED(EG(exception) != NULL)) {
+				HANDLE_EXCEPTION();
+			}
 			if (UNEXPECTED(ce == NULL)) {
-				CHECK_EXCEPTION();
-				ZEND_VM_NEXT_OPCODE();
+				zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
 			}
 			CACHE_PTR(opline->op1.literal->cache_slot, ce);
 		}
@@ -22414,9 +22473,11 @@ static int ZEND_FASTCALL  ZEND_FETCH_CONSTANT_SPEC_UNUSED_CONST_HANDLER(ZEND_OPC
 				ce = CACHED_PTR(opline->op1.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op1.zv), Z_STRLEN_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
+				if (UNEXPECTED(EG(exception) != NULL)) {
+					HANDLE_EXCEPTION();
+				}
 				if (UNEXPECTED(ce == NULL)) {
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
 				}
 				CACHE_PTR(opline->op1.literal->cache_slot, ce);
 			}
@@ -26978,9 +27039,12 @@ static int ZEND_FASTCALL  ZEND_RETURN_BY_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER
 			} else if (EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) {
 				zend_error(E_NOTICE, "Only variable references should be returned by reference");
 				if (EG(return_value_ptr_ptr)) {
-					retval_ptr = *retval_ptr_ptr;
-					*EG(return_value_ptr_ptr) = retval_ptr;
-					Z_ADDREF_P(retval_ptr);
+					zval *ret;
+
+					ALLOC_ZVAL(ret);
+					INIT_PZVAL_COPY(ret, *retval_ptr_ptr);
+					zval_copy_ctor(ret);
+					*EG(return_value_ptr_ptr) = ret;
 				}
 				break;
 			}
@@ -29424,15 +29488,17 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDL
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(ce == NULL)) {
+				if (UNEXPECTED(EG(exception) != NULL)) {
 					if (IS_CV != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_CV == IS_VAR || IS_CV == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					HANDLE_EXCEPTION();
+				}
+				if (UNEXPECTED(ce == NULL)) {
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -33381,15 +33447,17 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(ce == NULL)) {
+				if (UNEXPECTED(EG(exception) != NULL)) {
 					if (IS_CV != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_CV == IS_VAR || IS_CV == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					HANDLE_EXCEPTION();
+				}
+				if (UNEXPECTED(ce == NULL)) {
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
@@ -34517,15 +34585,17 @@ static int ZEND_FASTCALL  ZEND_UNSET_VAR_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HAND
 				ce = CACHED_PTR(opline->op2.literal->cache_slot);
 			} else {
 				ce = zend_fetch_class_by_name(Z_STRVAL_P(opline->op2.zv), Z_STRLEN_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
-				if (UNEXPECTED(ce == NULL)) {
+				if (UNEXPECTED(EG(exception) != NULL)) {
 					if (IS_CV != IS_CONST && varname == &tmp) {
 						zval_dtor(&tmp);
 					} else if (IS_CV == IS_VAR || IS_CV == IS_CV) {
 						zval_ptr_dtor(&varname);
 					}
 
-					CHECK_EXCEPTION();
-					ZEND_VM_NEXT_OPCODE();
+					HANDLE_EXCEPTION();
+				}
+				if (UNEXPECTED(ce == NULL)) {
+					zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
 				}
 				CACHE_PTR(opline->op2.literal->cache_slot, ce);
 			}
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index 97dc0e8be..d2f51925d 100644
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -1417,7 +1417,7 @@ for ($i = 1;  $i < $argc; $i++) {
 	  // Disabling code for old-style executor
 		define("ZEND_VM_OLD_EXECUTOR", 1);
 	} else if ($argv[$i] == "--with-lines") {
-		// Enabling debuging using original zend_vm_def.h
+		// Enabling debugging using original zend_vm_def.h
 		define("ZEND_VM_LINES", 1);
 	} else if ($argv[$i] == "--help") {
 		usage();
diff --git a/acinclude.m4 b/acinclude.m4
index ed7d1ea4e..448659f92 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -66,10 +66,10 @@ AC_DEFUN([PHP_EXPAND_PATH],[
     $2=$1
   else
     changequote({,})
-    ep_dir="`echo $1|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $1|$SED 's%/*[^/][^/]*/*$%%'`
     changequote([,])
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    $2="$ep_realdir/`basename \"$1\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    $2="$ep_realdir"/`basename "$1"`
   fi
 ])
 
@@ -1832,7 +1832,7 @@ AC_TRY_COMPILE([
 ])
 
 dnl -------------------------------------------------------------------------
-dnl Library/function existance and build sanity checks
+dnl Library/function existence and build sanity checks
 dnl -------------------------------------------------------------------------
 
 dnl
@@ -2925,14 +2925,17 @@ dnl providerdesc
 dnl header-file
   ac_hdrobj=$2
 
-dnl Add providerdesc.o into global objects when needed
+dnl Add providerdesc.o or .lo into global objects when needed
   case $host_alias in
   *freebsd*)
     PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o"
     PHP_LDFLAGS="$PHP_LDFLAGS -lelf"
     ;;
   *solaris*)
-    PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o"
+    PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.lo"
+    ;;
+  *linux*)
+    PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.lo"
     ;;
   esac
 
@@ -2959,15 +2962,53 @@ dnl DTrace objects
   esac
 
 dnl Generate Makefile.objects entries
+dnl The empty $ac_provsrc command stops an implicit circular dependency
+dnl in GNU Make which causes the .d file to be overwritten (Bug 61268)
   cat>>Makefile.objects<<EOF
 
+$abs_srcdir/$ac_provsrc:;
+
 $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
-	dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@ && \$(SED) -ibak 's,PHP_,DTRACE_,g' \$[]@
+	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
 
 \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
 
+EOF
+
+  case $host_alias in
+  *solaris*|*linux*)
+    dtrace_prov_name="`echo $ac_provsrc | $SED -e 's#\(.*\)\/##'`.o"
+    dtrace_lib_dir="`echo $ac_bdir[$]ac_provsrc | $SED -e 's#\(.*\)/[^/]*#\1#'`/.libs"
+    dtrace_d_obj="`echo $ac_bdir[$]ac_provsrc | $SED -e 's#\(.*\)/\([^/]*\)#\1/.libs/\2#'`.o"
+    dtrace_nolib_objs='$(PHP_DTRACE_OBJS:.lo=.o)'
+    for ac_lo in $PHP_DTRACE_OBJS; do
+      dtrace_lib_objs="[$]dtrace_lib_objs `echo $ac_lo | $SED -e 's,\.lo$,.o,' -e 's#\(.*\)\/#\1\/.libs\/#'`"
+    done;
+dnl Always attempt to create both PIC and non-PIC DTrace objects (Bug 63692)
+    cat>>Makefile.objects<<EOF
+$ac_bdir[$]ac_provsrc.lo: \$(PHP_DTRACE_OBJS)
+	echo "[#] Generated by Makefile for libtool" > \$[]@
+	@test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir
+	if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\]
+	  echo "pic_object=['].libs/$dtrace_prov_name[']" >> \$[]@ [;\\]
+	else [\\]
+	  echo "pic_object='none'" >> \$[]@ [;\\]
+	fi
+	if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\]
+	  echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\]
+	else [\\]
+	  echo "non_pic_object='none'" >> \$[]@ [;\\]
+	fi
+
+EOF
+
+    ;;
+  *)
+cat>>Makefile.objects<<EOF
 $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS)
-	dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
+	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
 
 EOF
+    ;;
+  esac
 ])
diff --git a/aclocal.m4 b/aclocal.m4
index ddd66fc16..7404b8561 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -66,10 +66,10 @@ AC_DEFUN([PHP_EXPAND_PATH],[
     $2=$1
   else
     changequote({,})
-    ep_dir="`echo $1|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $1|$SED 's%/*[^/][^/]*/*$%%'`
     changequote([,])
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    $2="$ep_realdir/`basename \"$1\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    $2="$ep_realdir"/`basename "$1"`
   fi
 ])
 
@@ -1832,7 +1832,7 @@ AC_TRY_COMPILE([
 ])
 
 dnl -------------------------------------------------------------------------
-dnl Library/function existance and build sanity checks
+dnl Library/function existence and build sanity checks
 dnl -------------------------------------------------------------------------
 
 dnl
@@ -2925,14 +2925,17 @@ dnl providerdesc
 dnl header-file
   ac_hdrobj=$2
 
-dnl Add providerdesc.o into global objects when needed
+dnl Add providerdesc.o or .lo into global objects when needed
   case $host_alias in
   *freebsd*)
     PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o"
     PHP_LDFLAGS="$PHP_LDFLAGS -lelf"
     ;;
   *solaris*)
-    PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o"
+    PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.lo"
+    ;;
+  *linux*)
+    PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.lo"
     ;;
   esac
 
@@ -2959,17 +2962,55 @@ dnl DTrace objects
   esac
 
 dnl Generate Makefile.objects entries
+dnl The empty $ac_provsrc command stops an implicit circular dependency
+dnl in GNU Make which causes the .d file to be overwritten (Bug 61268)
   cat>>Makefile.objects<<EOF
 
+$abs_srcdir/$ac_provsrc:;
+
 $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
-	dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@ && \$(SED) -ibak 's,PHP_,DTRACE_,g' \$[]@
+	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
 
 \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
 
+EOF
+
+  case $host_alias in
+  *solaris*|*linux*)
+    dtrace_prov_name="`echo $ac_provsrc | $SED -e 's#\(.*\)\/##'`.o"
+    dtrace_lib_dir="`echo $ac_bdir[$]ac_provsrc | $SED -e 's#\(.*\)/[^/]*#\1#'`/.libs"
+    dtrace_d_obj="`echo $ac_bdir[$]ac_provsrc | $SED -e 's#\(.*\)/\([^/]*\)#\1/.libs/\2#'`.o"
+    dtrace_nolib_objs='$(PHP_DTRACE_OBJS:.lo=.o)'
+    for ac_lo in $PHP_DTRACE_OBJS; do
+      dtrace_lib_objs="[$]dtrace_lib_objs `echo $ac_lo | $SED -e 's,\.lo$,.o,' -e 's#\(.*\)\/#\1\/.libs\/#'`"
+    done;
+dnl Always attempt to create both PIC and non-PIC DTrace objects (Bug 63692)
+    cat>>Makefile.objects<<EOF
+$ac_bdir[$]ac_provsrc.lo: \$(PHP_DTRACE_OBJS)
+	echo "[#] Generated by Makefile for libtool" > \$[]@
+	@test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir
+	if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\]
+	  echo "pic_object=['].libs/$dtrace_prov_name[']" >> \$[]@ [;\\]
+	else [\\]
+	  echo "pic_object='none'" >> \$[]@ [;\\]
+	fi
+	if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\]
+	  echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\]
+	else [\\]
+	  echo "non_pic_object='none'" >> \$[]@ [;\\]
+	fi
+
+EOF
+
+    ;;
+  *)
+cat>>Makefile.objects<<EOF
 $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS)
-	dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
+	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
 
 EOF
+    ;;
+  esac
 ])
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 ## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007,
@@ -4203,7 +4244,7 @@ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
    test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
    test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
 
-  # We can hardcode non-existant directories.
+  # We can hardcode non-existent directories.
   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library
diff --git a/build/libtool.m4 b/build/libtool.m4
index 268cad9d3..77735d36b 100644
--- a/build/libtool.m4
+++ b/build/libtool.m4
@@ -1230,7 +1230,7 @@ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
    test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
    test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
 
-  # We can hardcode non-existant directories.
+  # We can hardcode non-existent directories.
   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library
diff --git a/build/shtool b/build/shtool
index d50aa1dbb..684a01f5d 100755
--- a/build/shtool
+++ b/build/shtool
@@ -376,11 +376,11 @@ while [ $# -gt 0 ]; do
             eval "opt_${opt_OPT}=yes"
             ;;
         ':' )
-            #   option with argument (multiple occurances override)
+            #   option with argument (multiple occurrences override)
             eval "opt_${opt_OPT}=\"\$opt_ARG\""
             ;;
         '+' )
-            #   option with argument (multiple occurances append)
+            #   option with argument (multiple occurrences append)
             eval "opt_${opt_OPT}=\"\$opt_${opt_OPT}\${ASC_NL}\$opt_ARG\""
             ;;
         * )
diff --git a/configure b/configure
index 5f3cc8fac..ddf53441d 100755
--- a/configure
+++ b/configure
@@ -1,60 +1,83 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.65.
+#
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+#
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # 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
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+as_nl='
+'
+export as_nl
+# 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 test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 
@@ -63,20 +86,18 @@ fi
 # 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.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -87,354 +108,321 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# 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.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
+  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_have_required=no
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
-
-  if test $as_have_required = yes && 	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
 
 exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+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 :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || 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 :
+  as_have_required=yes
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_have_required=no
 fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
 else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  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
   test -z "$as_dir" && as_dir=.
-  case $as_dir in
+  as_found=:
+  case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $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_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
 	   done;;
        esac
+  as_found=false
 done
+$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; }
 IFS=$as_save_IFS
 
 
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
+    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
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
 fi
-
 fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
 
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
 
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
 
-fi
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
 
-fi
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
 
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# 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 :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# 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 :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
 
 
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
 
-exitcode=0
-if as_func_success; then
-  :
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
 else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
+  as_expr=false
 fi
 
-if as_func_ret_success; then
-  :
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
 else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
+  as_basename=false
 fi
 
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_dirname=false
 fi
 
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
-}
-
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
 
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO 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'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -451,8 +439,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
@@ -462,49 +449,40 @@ test \$exitcode = 0") || {
   exit
 }
 
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -512,7 +490,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -529,12 +507,12 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
-	case $1 in
-        -*)set "./$1";;
+	case $1 in #(
+	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -549,7 +527,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 
-
 # Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
@@ -701,7 +678,8 @@ fi
 
 tagnames=${tagnames+${tagnames},}CXX
 
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -719,7 +697,6 @@ cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME=
@@ -727,6 +704,7 @@ PACKAGE_TARNAME=
 PACKAGE_VERSION=
 PACKAGE_STRING=
 PACKAGE_BUGREPORT=
+PACKAGE_URL=
 
 ac_unique_file="README.GIT-RULES"
 # Factoring default headers for most tests.
@@ -766,152 +744,340 @@ ac_includes_default="\
 #endif"
 
 ac_header_list=
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-GREP
-EGREP
-SED
-CONFIGURE_COMMAND
-CONFIGURE_OPTIONS
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-target
-target_cpu
-target_vendor
-target_os
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-CPP
-LN_S
-AWK
-YACC
-YFLAGS
-RE2C
-SHLIB_SUFFIX_NAME
-SHLIB_DL_SUFFIX_NAME
-php_fpm_user
-php_fpm_group
-php_fpm_sysconfdir
-php_fpm_localstatedir
-php_fpm_prefix
-PROG_SENDMAIL
-LIBOBJS
-ALLOCA
-LTP
-LTP_GENHTML
-KRB5_CONFIG
-PKG_CONFIG
-OPENSSL_INCDIR_OPT
-ICU_CONFIG
-CXX
-CXXFLAGS
-ac_ct_CXX
-CXXCPP
-MYSQL_MODULE_TYPE
-MYSQL_LIBS
-MYSQL_INCLUDE
-OCI8_SHARED_LIBADD
-OCI8_DIR
-OCI8_ORACLE_VERSION
-ODBC_INCLUDE
-ODBC_LIBS
-ODBC_LFLAGS
-ODBC_TYPE
-PDO_MYSQL_MODULE_TYPE
-PDO_OCI_SHARED_LIBADD
-PDO_OCI_DIR
-PDO_OCI_VERSION
-SNMP_CONFIG
-RANLIB
-INLINE_CFLAGS
-INCLUDE_PATH
-EXPANDED_PEAR_INSTALLDIR
-EXPANDED_EXTENSION_DIR
-EXPANDED_BINDIR
-EXPANDED_SBINDIR
-EXPANDED_MANDIR
-EXPANDED_LIBDIR
-EXPANDED_DATADIR
-EXPANDED_SYSCONFDIR
-EXPANDED_LOCALSTATEDIR
-EXPANDED_PHP_CONFIG_FILE_PATH
-EXPANDED_PHP_CONFIG_FILE_SCAN_DIR
-PHP_INSTALLED_SAPIS
-abs_builddir
-abs_srcdir
-php_abs_top_builddir
-php_abs_top_srcdir
-program_prefix
-program_suffix
-DEBUG_CFLAGS
-EXTENSION_DIR
-EXTRA_LDFLAGS
-EXTRA_LDFLAGS_PROGRAM
-EXTRA_LIBS
-ZEND_EXTRA_LIBS
-INCLUDES
-EXTRA_INCLUDES
-INSTALL_IT
-NATIVE_RPATHS
-PEAR_INSTALLDIR
-PHP_LDFLAGS
-PHP_LIBS
-PHP_VERSION
-PHP_VERSION_ID
-ECHO
-AR
-STRIP
-DSYMUTIL
-NMEDIT
+ac_subst_vars='LTLIBOBJS
 LIBTOOL
-LTLIBOBJS'
+NMEDIT
+DSYMUTIL
+STRIP
+AR
+ECHO
+PHP_VERSION_ID
+PHP_VERSION
+PHP_LIBS
+PHP_LDFLAGS
+PEAR_INSTALLDIR
+NATIVE_RPATHS
+INSTALL_IT
+EXTRA_INCLUDES
+INCLUDES
+ZEND_EXTRA_LIBS
+EXTRA_LIBS
+EXTRA_LDFLAGS_PROGRAM
+EXTRA_LDFLAGS
+EXTENSION_DIR
+DEBUG_CFLAGS
+program_suffix
+program_prefix
+php_abs_top_srcdir
+php_abs_top_builddir
+abs_srcdir
+abs_builddir
+PHP_INSTALLED_SAPIS
+EXPANDED_PHP_CONFIG_FILE_SCAN_DIR
+EXPANDED_PHP_CONFIG_FILE_PATH
+EXPANDED_LOCALSTATEDIR
+EXPANDED_SYSCONFDIR
+EXPANDED_DATADIR
+EXPANDED_LIBDIR
+EXPANDED_MANDIR
+EXPANDED_SBINDIR
+EXPANDED_BINDIR
+EXPANDED_EXTENSION_DIR
+EXPANDED_PEAR_INSTALLDIR
+INCLUDE_PATH
+INLINE_CFLAGS
+RANLIB
+SNMP_CONFIG
+PDO_OCI_VERSION
+PDO_OCI_DIR
+PDO_OCI_SHARED_LIBADD
+PDO_MYSQL_MODULE_TYPE
+ODBC_TYPE
+ODBC_LFLAGS
+ODBC_LIBS
+ODBC_INCLUDE
+OCI8_ORACLE_VERSION
+OCI8_DIR
+OCI8_SHARED_LIBADD
+MYSQL_INCLUDE
+MYSQL_LIBS
+MYSQL_MODULE_TYPE
+CXXCPP
+ac_ct_CXX
+CXXFLAGS
+CXX
+ICU_CONFIG
+OPENSSL_INCDIR_OPT
+PKG_CONFIG
+KRB5_CONFIG
+LTP_GENHTML
+LTP
+ALLOCA
+LIBOBJS
+PROG_SENDMAIL
+php_fpm_prefix
+php_fpm_localstatedir
+php_fpm_sysconfdir
+php_fpm_group
+php_fpm_user
+php_fpm_systemd
+SHLIB_DL_SUFFIX_NAME
+SHLIB_SUFFIX_NAME
+RE2C
+YFLAGS
+YACC
+AWK
+LN_S
+CPP
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+target_os
+target_vendor
+target_cpu
+target
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+CONFIGURE_OPTIONS
+CONFIGURE_COMMAND
+SED
+EGREP
+GREP
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+with_libdir
+enable_rpath
+enable_re2c_cgoto
+enable_
+with_aolserver
+with_apxs
+with_apache
+enable_mod_charset
+with_apxs2filter
+with_apxs2
+with_apache_hooks
+with_apache_hooks_static
+with_caudium
+enable_cli
+with_continuity
+enable_embed
+enable_fpm
+with_fpm_user
+with_fpm_group
+with_fpm_systemd
+with_isapi
+with_litespeed
+with_milter
+with_nsapi
+with_phttpd
+with_pi3web
+with_roxen
+enable_roxen_zts
+with_thttpd
+with_tux
+with_webjames
+enable_cgi
+enable_gcov
+enable_debug
+with_layout
+with_config_file_path
+with_config_file_scan_dir
+enable_sigchild
+enable_libgcc
+enable_short_tags
+enable_dmalloc
+enable_ipv6
+enable_dtrace
+enable_fd_setsize
+enable_all
+with_regex
+enable_libxml
+with_libxml_dir
+with_openssl
+with_kerberos
+with_pcre_regex
+with_sqlite3
+with_zlib
+with_zlib_dir
+enable_bcmath
+with_bz2
+enable_calendar
+enable_ctype
+with_curl
+with_curlwrappers
+enable_dba
+with_qdbm
+with_gdbm
+with_ndbm
+with_db4
+with_db3
+with_db2
+with_db1
+with_dbm
+with_tcadb
+with_cdb
+enable_inifile
+enable_flatfile
+enable_dom
+with_enchant
+enable_exif
+enable_fileinfo
+enable_filter
+with_pcre_dir
+enable_ftp
+with_openssl_dir
+with_gd
+with_vpx_dir
+with_jpeg_dir
+with_png_dir
+with_xpm_dir
+with_freetype_dir
+with_t1lib
+enable_gd_native_ttf
+enable_gd_jis_conv
+with_gettext
+with_gmp
+with_mhash
+enable_hash
+with_iconv
+with_imap
+with_imap_ssl
+with_interbase
+enable_intl
+with_icu_dir
+enable_json
+with_ldap
+with_ldap_sasl
+enable_mbstring
+enable_mbregex
+enable_mbregex_backtrack
+with_libmbfl
+with_onig
+with_mcrypt
+with_mssql
+with_mysql
+with_mysql_sock
+with_mysqli
+enable_embedded_mysqli
+with_oci8
+with_adabas
+with_sapdb
+with_solid
+with_ibm_db2
+with_ODBCRouter
+with_empress
+with_empress_bcs
+with_birdstep
+with_custom_odbc
+with_iodbc
+with_esoob
+with_unixODBC
+with_dbmaker
+enable_pcntl
+enable_pdo
+with_pdo_dblib
+with_pdo_firebird
+with_pdo_mysql
+with_pdo_oci
+with_pdo_odbc
+with_pdo_pgsql
+with_pdo_sqlite
+with_pgsql
+enable_phar
+enable_posix
+with_pspell
+with_libedit
+with_readline
+with_recode
+enable_session
+with_mm
+enable_shmop
+enable_simplexml
+with_snmp
+enable_soap
+enable_sockets
+with_sybase_ct
+enable_sysvmsg
+enable_sysvsem
+enable_sysvshm
+with_tidy
+enable_tokenizer
+enable_wddx
+with_libexpat_dir
+enable_xml
+enable_xmlreader
+with_xmlrpc
+with_iconv_dir
+enable_xmlwriter
+with_xsl
+enable_zip
+enable_mysqlnd
+enable_mysqlnd_compression_support
+with_pear
+with_zend_vm
+enable_maintainer_zts
+enable_inline_optimization
+enable_zend_signals
+with_tsrm_pth
+with_tsrm_st
+with_tsrm_pthreads
+enable_shared
+enable_static
+enable_fast_install
+with_gnu_ld
+enable_libtool_lock
+with_pic
+with_tags
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -932,6 +1098,8 @@ CXXCPP'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -1030,13 +1198,20 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -1049,13 +1224,20 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1246,22 +1428,36 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1281,25 +1477,25 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+    esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$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 &&
-      echo "$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}
     ;;
 
@@ -1308,23 +1504,36 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "missing argument to $ac_option"
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 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
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1338,7 +1547,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1354,23 +1563,21 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1397,13 +1604,11 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1451,9 +1656,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1463,25 +1668,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --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]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --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]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1498,6 +1703,7 @@ if test -n "$ac_init_help"; then
   cat <<\_ACEOF
 
 Optional Features and Packages:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1539,6 +1745,7 @@ SAPI modules:
   --with-fpm-user=USER  Set the user for php-fpm to run as. (default: nobody)
   --with-fpm-group=GRP  Set the group for php-fpm to run as. For a system user, this
                   should usually be set to match the fpm username (default: nobody)
+  --with-fpm-systemd      Activate systemd integration
   --with-isapi=DIR      Build PHP as an ISAPI module for use with Zeus
   --with-litespeed        Build PHP as litespeed module
   --with-milter=DIR     Build PHP as Milter application
@@ -1667,7 +1874,7 @@ Extensions:
   --with-mysql=DIR      Include MySQL support.  DIR is the MySQL base
                           directory, if no DIR is passed or the value is
                           mysqlnd the MySQL native driver will be used
-  --with-mysql-sock=DIR   MySQL/MySQLi/PDO_MYSQL: Location of the MySQL unix socket pointer.
+  --with-mysql-sock=SOCKPATH   MySQL/MySQLi/PDO_MYSQL: Location of the MySQL unix socket pointer.
                             If unspecified, the default locations are searched
   --with-zlib-dir=DIR     MySQL: Set the path to libz install prefix
   --with-mysqli=FILE    Include MySQLi support.  FILE is the path
@@ -1829,7 +2036,7 @@ Some influential environment variables:
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   YACC        The `Yet Another C Compiler' implementation to use. Defaults to
@@ -1844,6 +2051,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
+Report bugs to the package provider.
 _ACEOF
 ac_status=$?
 fi
@@ -1851,15 +2059,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$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=`echo "$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/ ;;
@@ -1895,7 +2105,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$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
@@ -1905,21 +2115,775 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.65
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  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\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$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;}
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# 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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+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$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\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* 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 $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
+# ----------------------------------------------------
+# Tries to find if the field MEMBER exists in type AGGR, after including
+# INCLUDES, setting cache variable VAR accordingly.
+ac_fn_c_check_member ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+$as_echo_n "checking for $2.$3... " >&6; }
+if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$4=yes"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$5
+int
+main ()
+{
+static $2 ac_aggr;
+if (sizeof ac_aggr.$3)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$4=yes"
+else
+  eval "$4=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$4
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_member
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR
+# ------------------------------------
+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
+$as_echo_n "checking whether $2 is declared... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $2
+  (void) $2;
+#endif
+
+  ;
+  return 0;
+}
+_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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_decl
+
+# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
+# --------------------------------------------
+# Tries to find the compile-time value of EXPR in a program that includes
+# INCLUDES, setting VAR accordingly. Returns whether the value could be
+# computed
+ac_fn_c_compute_int ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if test "$cross_compiling" = yes; then
+    # Depending upon the size, compute the lo and hi bounds.
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) >= 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+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 ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid; break
+else
+  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+			if test $ac_lo -le $ac_mid; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) < 0)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+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 ()
+{
+static int test_array [1 - 2 * !(($2) >= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_lo=$ac_mid; break
+else
+  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+			if test $ac_mid -le $ac_hi; then
+			  ac_lo= ac_hi=
+			  break
+			fi
+			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  ac_lo= ac_hi=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+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
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+static int test_array [1 - 2 * !(($2) <= $ac_mid)];
+test_array [0] = 0
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_hi=$ac_mid
+else
+  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in #((
+?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
+'') ac_retval=1 ;;
+esac
+  else
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+static long int longval () { return $2; }
+static unsigned long int ulongval () { return $2; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+  FILE *f = fopen ("conftest.val", "w");
+  if (! f)
+    return 1;
+  if (($2) < 0)
+    {
+      long int i = longval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%ld", i);
+    }
+  else
+    {
+      unsigned long int i = ulongval ();
+      if (i != ($2))
+	return 1;
+      fprintf (f, "%lu", i);
+    }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
+  return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+else
+  ac_retval=1
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f conftest.val
+
+  fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_compute_int
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_type
+
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  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\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_compile
+
+# ac_fn_cxx_try_cpp LINENO
+# ------------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_cpp
 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 $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
@@ -1955,8 +2919,8 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
+    $as_echo "PATH: $as_dir"
+  done
 IFS=$as_save_IFS
 
 } >&5
@@ -1990,12 +2954,12 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      as_fn_append ac_configure_args1 " '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
@@ -2011,13 +2975,13 @@ do
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
+      as_fn_append ac_configure_args " '$ac_arg'"
       ;;
     esac
   done
 done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
@@ -2042,12 +3006,13 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$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) ;; #(
-      *) $as_unset $ac_var ;;
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -2076,9 +3041,9 @@ _ASBOX
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -2093,9 +3058,9 @@ _ASBOX
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -2111,87 +3076,92 @@ _ASBOX
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$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 &&
     exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
+$as_echo "/* confdefs.h */" > confdefs.h
+
 # Predefined preprocessor variables.
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$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
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$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"
   fi
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+  # 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
+    { $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
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$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
 
-ac_header_list="$ac_header_list utime.h"
+as_fn_append ac_header_list " utime.h"
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -2202,60 +3172,56 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# 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=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
+  { $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. ##
+## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -2268,45 +3234,40 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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 test "${ac_cv_path_GREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    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"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"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"
-    echo '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
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_GREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_GREP="$ac_path_GREP"
@@ -2318,77 +3279,61 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
+  done
   done
-done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$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"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; 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
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-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
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    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"
+      { test -f "$ac_path_EGREP" && $as_test_x "$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
-  echo $ECHO_N "0123456789$ECHO_C" >"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"
-    echo 'EGREP' >> "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
-    ac_count=`expr $ac_count + 1`
+    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"
@@ -2400,40 +3345,29 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
+  done
   done
-done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
+  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
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $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"
 
 
-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
-if test "${lt_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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 test "${lt_cv_path_SED+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   # Loop through the user's path and test for sed and gsed.
 # Then use that list of sed's as ones to test for truncation.
@@ -2484,8 +3418,8 @@ done
 fi
 
 SED=$lt_cv_path_SED
-{ echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
+$as_echo "$SED" >&6; }
 
 
 
@@ -2558,24 +3492,16 @@ EOF
 
 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
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
+  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,
@@ -2589,35 +3515,27 @@ 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 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; 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"`
 test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
+  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` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$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
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -2633,28 +3551,24 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; 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` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$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
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -2670,28 +3584,24 @@ IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
-if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
+$as_echo_n "checking target system type... " >&6; }
+if test "${ac_cv_target+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test "x$target_alias" = x; then
   ac_cv_target=$ac_cv_host
 else
   ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
+$as_echo "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-echo "$as_me: error: invalid value of canonical target" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
 esac
 target=$ac_cv_target
 ac_save_IFS=$IFS; IFS='-'
@@ -2718,9 +3628,7 @@ test -n "$target_alias" &&
     host_alias=$host
   fi
   if test -z "$host_alias"; then
-    { { echo "$as_me:$LINENO: error: host_alias is not set!" >&5
-echo "$as_me: error: host_alias is not set!" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "host_alias is not set!" "$LINENO" 5
   fi
 
 
@@ -2729,11 +3637,9 @@ ac_config_headers="$ac_config_headers main/php_config.h"
 
 
 
-
-
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=4
-PHP_RELEASE_VERSION=15
+PHP_RELEASE_VERSION=21
 PHP_EXTRA_VERSION=""
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr $PHP_MAJOR_VERSION \* 10000 + $PHP_MINOR_VERSION \* 100 + $PHP_RELEASE_VERSION`
@@ -2772,21 +3678,15 @@ fi
 
 
 if test "$with_shared_apache" != "no" && test -n "$with_shared_apache" ; then
-  { { echo "$as_me:$LINENO: error: --with-shared-apache is not supported. Please refer to the documentation for using APXS" >&5
-echo "$as_me: error: --with-shared-apache is not supported. Please refer to the documentation for using APXS" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "--with-shared-apache is not supported. Please refer to the documentation for using APXS" "$LINENO" 5
 fi
 
 if test -n "$with_apache" && test -n "$with_apxs"; then
-  { { echo "$as_me:$LINENO: error: --with-apache and --with-apxs cannot be used together" >&5
-echo "$as_me: error: --with-apache and --with-apxs cannot be used together" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "--with-apache and --with-apxs cannot be used together" "$LINENO" 5
 fi
 
 if test -n "$with_apxs2filter" && test -n "$with_apxs2"; then
-  { { echo "$as_me:$LINENO: error: --with-apxs2filter and --with-apxs2 cannot be used together" >&5
-echo "$as_me: error: --with-apxs2filter and --with-apxs2 cannot be used together" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "--with-apxs2filter and --with-apxs2 cannot be used together" "$LINENO" 5
 fi
 
 
@@ -2828,10 +3728,10 @@ 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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2841,25 +3741,25 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2872,10 +3772,10 @@ 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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; 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.
@@ -2885,25 +3785,25 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2915,12 +3815,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&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
@@ -2928,51 +3824,37 @@ esac
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+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.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&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; do
+  { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2984,42 +3866,38 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+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.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $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.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
 rm -f $ac_rmfiles
 
-if { (ac_try="$ac_link_default"
+if { { ac_try="$ac_link_default"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; 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,
@@ -3029,14 +3907,14 @@ for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
 	# certainly right.
 	break;;
     *.* )
-        if test "${ac_cv_exeext+set}" = set && 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
@@ -3055,78 +3933,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
 else
   ac_file=''
 fi
-
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
-if test -z "$ac_file"; then
-  echo "$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
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
+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
 
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
-
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-if { (ac_try="$ac_link"
+{ $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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; 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
@@ -3134,37 +3976,90 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $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$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+rm -f conftest conftest$ac_cv_exeext
+{ $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
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_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.
+{ $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
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    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 run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $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
+{ $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 test "${ac_cv_objext+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3176,51 +4071,46 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
+if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; 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
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+{ { $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
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$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
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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 test "${ac_cv_c_compiler_gnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3234,54 +4124,34 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $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+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; 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
    CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3292,34 +4162,11 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3330,35 +4177,12 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
 
-	ac_c_werror_flag=$ac_save_c_werror_flag
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3369,42 +4193,18 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $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
@@ -3420,18 +4220,14 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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 test "${ac_cv_prog_cc_c89+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -3488,31 +4284,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c89=$ac_arg
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
@@ -3523,17 +4297,19 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $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
 ac_cpp='$CPP $CPPFLAGS'
@@ -3547,15 +4323,15 @@ 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
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&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+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if test "${ac_cv_prog_CPP+set}" = set; 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"
@@ -3569,11 +4345,7 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -3582,76 +4354,34 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+if $ac_preproc_ok; then :
   break
 fi
 
@@ -3663,8 +4393,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$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
@@ -3674,11 +4404,7 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -3687,83 +4413,40 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+if $ac_preproc_ok; then :
+
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -3775,77 +4458,65 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
   ICC="no"
-  { echo "$as_me:$LINENO: checking for icc" >&5
-echo $ECHO_N "checking for icc... $ECHO_C" >&6; }
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for icc" >&5
+$as_echo_n "checking for icc... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 __INTEL_COMPILER
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^__INTEL_COMPILER" >/dev/null 2>&1; then
+  $EGREP "^__INTEL_COMPILER" >/dev/null 2>&1; then :
   ICC="no"
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 else
   ICC="yes"
     GCC="no"
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 
 
   SUNCC="no"
-  { echo "$as_me:$LINENO: checking for suncc" >&5
-echo $ECHO_N "checking for suncc... $ECHO_C" >&6; }
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suncc" >&5
+$as_echo_n "checking for suncc... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 __SUNPRO_C
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "^__SUNPRO_C" >/dev/null 2>&1; then
+  $EGREP "^__SUNPRO_C" >/dev/null 2>&1; then :
   SUNCC="no"
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 else
   SUNCC="yes"
     GCC="no"
     test -n "$auto_cflags" && CFLAGS="-O -xs -xstrconst -zlazyload"
     GCC=""
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 
 if test "x$CC" != xcc; then
-  { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
-echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
-echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
 fi
-set dummy $CC; ac_cc=`echo $2 |
+set dummy $CC; ac_cc=`$as_echo "$2" |
 		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3861,58 +4532,63 @@ _ACEOF
 # existing .o file with -o, though they will create one.
 ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
 rm -f conftest2.*
-if { (case "(($ac_try" in
+if { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-   test -f conftest2.$ac_objext && { (case "(($ac_try" in
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } &&
+   test -f conftest2.$ac_objext && { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; };
 then
   eval ac_cv_prog_cc_${ac_cc}_c_o=yes
   if test "x$CC" != xcc; then
     # Test first that cc exists at all.
     if { ac_try='cc -c conftest.$ac_ext >&5'
-  { (case "(($ac_try" in
+  { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
       ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
       rm -f conftest2.*
-      if { (case "(($ac_try" in
+      if { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } &&
+	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; };
       then
 	# cc works too.
 	:
@@ -3925,19 +4601,17 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 else
   eval ac_cv_prog_cc_${ac_cc}_c_o=no
 fi
-rm -f -r core conftest*
+rm -f core conftest*
 
 fi
 if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define NO_MINUS_C_MINUS_O 1
-_ACEOF
+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
 
 fi
 
@@ -3946,15 +4620,15 @@ 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
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&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+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if test "${ac_cv_prog_CPP+set}" = set; 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"
@@ -3968,11 +4642,7 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -3981,76 +4651,34 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+if $ac_preproc_ok; then :
   break
 fi
 
@@ -4062,8 +4690,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$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
@@ -4073,11 +4701,7 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -4086,83 +4710,40 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+if $ac_preproc_ok; then :
+
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -4171,55 +4752,218 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
 
-{ echo "$as_me:$LINENO: checking for AIX" >&5
-echo $ECHO_N "checking for AIX... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+  ;
+  return 0;
+}
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+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.  */
-#ifdef _AIX
-  yes
-#endif
+#include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define _ALL_SOURCE 1
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
 _ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
 
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  ac_cv_header_stdc=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
 
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+#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
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $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
+
+fi
+
+# 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
+"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+  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" = x""yes; then :
+  MINIX=yes
+else
+  MINIX=
+fi
+
+
+  if test "$MINIX" = yes; then
+
+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
+
+
+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
+
+
+$as_echo "#define _MINIX 1" >>confdefs.h
+
+  fi
+
+
+  { $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 test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#	  define __EXTENSIONS__ 1
+	  $ac_includes_default
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_safe_to_define___extensions__=yes
+else
+  ac_cv_safe_to_define___extensions__=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
+
+  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
+  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
 
 
 php_with_libdir=lib
 
-{ echo "$as_me:$LINENO: checking for system library directory" >&5
-echo $ECHO_N "checking for system library directory... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for system library directory" >&5
+$as_echo_n "checking for system library directory... " >&6; }
 
 # Check whether --with-libdir was given.
-if test "${with_libdir+set}" = set; then
+if test "${with_libdir+set}" = set; then :
   withval=$with_libdir; PHP_LIBDIR=$withval
 else
 
@@ -4230,8 +4974,8 @@ fi
 
 
 ext_output=$PHP_LIBDIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -4239,10 +4983,10 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_enable_rpath=yes
 
-{ echo "$as_me:$LINENO: checking whether to enable runpaths" >&5
-echo $ECHO_N "checking whether to enable runpaths... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable runpaths" >&5
+$as_echo_n "checking whether to enable runpaths... " >&6; }
 # Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then
+if test "${enable_rpath+set}" = set; then :
   enableval=$enable_rpath; PHP_RPATH=$enableval
 else
 
@@ -4253,26 +4997,22 @@ fi
 
 
 ext_output=$PHP_RPATH
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 
-{ echo "$as_me:$LINENO: checking if compiler supports -R" >&5
-echo $ECHO_N "checking if compiler supports -R... $ECHO_C" >&6; }
-if test "${php_cv_cc_dashr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -R" >&5
+$as_echo_n "checking if compiler supports -R... " >&6; }
+if test "${php_cv_cc_dashr+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
   SAVE_LIBS=$LIBS
   LIBS="-R /usr/$PHP_LIBDIR $LIBS"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4283,55 +5023,30 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   php_cv_cc_dashr=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	php_cv_cc_dashr=no
+  php_cv_cc_dashr=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   LIBS=$SAVE_LIBS
 fi
 
-{ echo "$as_me:$LINENO: result: $php_cv_cc_dashr" >&5
-echo "${ECHO_T}$php_cv_cc_dashr" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_cc_dashr" >&5
+$as_echo "$php_cv_cc_dashr" >&6; }
 if test $php_cv_cc_dashr = "yes"; then
   ld_runpath_switch=-R
 else
-  { echo "$as_me:$LINENO: checking if compiler supports -Wl,-rpath," >&5
-echo $ECHO_N "checking if compiler supports -Wl,-rpath,... $ECHO_C" >&6; }
-  if test "${php_cv_cc_rpath+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -Wl,-rpath," >&5
+$as_echo_n "checking if compiler supports -Wl,-rpath,... " >&6; }
+  if test "${php_cv_cc_rpath+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
     SAVE_LIBS=$LIBS
     LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4342,39 +5057,18 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   php_cv_cc_rpath=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	php_cv_cc_rpath=no
+  php_cv_cc_rpath=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
     LIBS=$SAVE_LIBS
 fi
 
-  { echo "$as_me:$LINENO: result: $php_cv_cc_rpath" >&5
-echo "${ECHO_T}$php_cv_cc_rpath" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_cc_rpath" >&5
+$as_echo "$php_cv_cc_rpath" >&6; }
   if test $php_cv_cc_rpath = "yes"; then
     ld_runpath_switch=-Wl,-rpath,
   else
@@ -4391,10 +5085,10 @@ fi
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -4405,25 +5099,25 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4433,28 +5127,24 @@ test -n "$AWK" || AWK="bork"
 
   case "$AWK" in
     *mawk)
-      { echo "$as_me:$LINENO: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&5
-echo "$as_me: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&5
+$as_echo "$as_me: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&2;}
       ;;
     *gawk)
       ;;
     bork)
-      { { echo "$as_me:$LINENO: error: Could not find awk; Install GNU awk" >&5
-echo "$as_me: error: Could not find awk; Install GNU awk" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Could not find awk; Install GNU awk" "$LINENO" 5
       ;;
     *)
-      { echo "$as_me:$LINENO: checking if $AWK is broken" >&5
-echo $ECHO_N "checking if $AWK is broken... $ECHO_C" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $AWK is broken" >&5
+$as_echo_n "checking if $AWK is broken... " >&6; }
       if ! $AWK 'function foo() {}' >/dev/null 2>&1 ; then
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-        { { echo "$as_me:$LINENO: error: You should install GNU awk" >&5
-echo "$as_me: error: You should install GNU awk" >&2;}
-   { (exit 1); exit 1; }; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        as_fn_error "You should install GNU awk" "$LINENO" 5
       else
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       fi
       ;;
   esac
@@ -4467,10 +5157,10 @@ echo "${ECHO_T}no" >&6; }
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_YACC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_YACC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -4480,25 +5170,25 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_YACC="$ac_prog"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  { echo "$as_me:$LINENO: result: $YACC" >&5
-echo "${ECHO_T}$YACC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
+$as_echo "$YACC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4508,17 +5198,17 @@ test -n "$YACC" || YACC="yacc"
 
 
   # we only support certain bison versions
-  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2"
+  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2 2.6.4"
 
   # for standalone build of Zend Engine
   test -z "$SED" && SED=sed
 
   bison_version=none
   if test "$YACC"; then
-    { echo "$as_me:$LINENO: checking for bison version" >&5
-echo $ECHO_N "checking for bison version... $ECHO_C" >&6; }
-if test "${php_cv_bison_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bison version" >&5
+$as_echo_n "checking for bison version... " >&6; }
+if test "${php_cv_bison_version+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
       bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
@@ -4535,14 +5225,14 @@ else
       fi
 
 fi
-{ echo "$as_me:$LINENO: result: $php_cv_bison_version" >&5
-echo "${ECHO_T}$php_cv_bison_version" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_bison_version" >&5
+$as_echo "$php_cv_bison_version" >&6; }
   fi
   case $php_cv_bison_version in
     ""|invalid)
       bison_msg="bison versions supported for regeneration of the Zend/PHP parsers: $bison_version_list (found: $bison_version)."
-      { echo "$as_me:$LINENO: WARNING: $bison_msg" >&5
-echo "$as_me: WARNING: $bison_msg" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $bison_msg" >&5
+$as_echo "$as_me: WARNING: $bison_msg" >&2;}
       YACC="exit 0;"
       ;;
   esac
@@ -4554,10 +5244,10 @@ echo "$as_me: WARNING: $bison_msg" >&2;}
 
   # Extract the first word of "re2c", so it can be a program name with args.
 set dummy re2c; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RE2C+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RE2C+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RE2C"; then
   ac_cv_prog_RE2C="$RE2C" # Let the user override the test.
@@ -4567,33 +5257,33 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RE2C="re2c"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 RE2C=$ac_cv_prog_RE2C
 if test -n "$RE2C"; then
-  { echo "$as_me:$LINENO: result: $RE2C" >&5
-echo "${ECHO_T}$RE2C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RE2C" >&5
+$as_echo "$RE2C" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   if test -n "$RE2C"; then
-    { echo "$as_me:$LINENO: checking for re2c version" >&5
-echo $ECHO_N "checking for re2c version... $ECHO_C" >&6; }
-if test "${php_cv_re2c_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for re2c version" >&5
+$as_echo_n "checking for re2c version... " >&6; }
+if test "${php_cv_re2c_version+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
       re2c_vernum=`$RE2C --vernum 2>/dev/null`
@@ -4604,13 +5294,13 @@ else
       fi
 
 fi
-{ echo "$as_me:$LINENO: result: $php_cv_re2c_version" >&5
-echo "${ECHO_T}$php_cv_re2c_version" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_re2c_version" >&5
+$as_echo "$php_cv_re2c_version" >&6; }
   fi
   case $php_cv_re2c_version in
     ""|invalid)
-      { echo "$as_me:$LINENO: WARNING: You will need re2c 0.13.4 or later if you want to regenerate PHP parsers." >&5
-echo "$as_me: WARNING: You will need re2c 0.13.4 or later if you want to regenerate PHP parsers." >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You will need re2c 0.13.4 or later if you want to regenerate PHP parsers." >&5
+$as_echo "$as_me: WARNING: You will need re2c 0.13.4 or later if you want to regenerate PHP parsers." >&2;}
       RE2C="exit 0;"
       ;;
   esac
@@ -4622,9 +5312,7 @@ echo "$as_me: WARNING: You will need re2c 0.13.4 or later if you want to regener
 case $php_cv_bison_version in
   ""|invalid)
     if ! test -f "$abs_srcdir/Zend/zend_language_parser.h" || ! test -f "$abs_srcdir/Zend/zend_language_parser.c" ; then
-      { { echo "$as_me:$LINENO: error: bison is required to build PHP/Zend when building a GIT checkout!" >&5
-echo "$as_me: error: bison is required to build PHP/Zend when building a GIT checkout!" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "bison is required to build PHP/Zend when building a GIT checkout!" "$LINENO" 5
     fi
     ;;
 esac
@@ -4632,10 +5320,10 @@ esac
 
 php_enable_re2c_cgoto=no
 
-{ echo "$as_me:$LINENO: checking whether to enable computed goto gcc extension with re2c" >&5
-echo $ECHO_N "checking whether to enable computed goto gcc extension with re2c... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable computed goto gcc extension with re2c" >&5
+$as_echo_n "checking whether to enable computed goto gcc extension with re2c... " >&6; }
 # Check whether --enable-re2c-cgoto was given.
-if test "${enable_re2c_cgoto+set}" = set; then
+if test "${enable_re2c_cgoto+set}" = set; then :
   enableval=$enable_re2c_cgoto; PHP_RE2C_CGOTO=$enableval
 else
 
@@ -4646,8 +5334,8 @@ fi
 
 
 ext_output=$PHP_RE2C_CGOTO
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -4655,13 +5343,9 @@ echo "${ECHO_T}$ext_output" >&6; }
 if test "$PHP_RE2C_CGOTO" = "no"; then
   RE2C_FLAGS=""
 else
-  { echo "$as_me:$LINENO: checking whether re2c -g works" >&5
-echo $ECHO_N "checking whether re2c -g works... $ECHO_C" >&6; }
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether re2c -g works" >&5
+$as_echo_n "checking whether re2c -g works... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4683,39 +5367,19 @@ label2:
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
     RE2C_FLAGS=""
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
     RE2C_FLAGS="-g"
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}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.$ac_ext
 fi
 
@@ -4766,10 +5430,10 @@ case $host_alias in
     if test -n "$GCC"; then
 
   gcc_arg_name=ac_cv_gcc_arg_no_cpp_precomp
-  { echo "$as_me:$LINENO: checking whether $CC supports -no-cpp-precomp" >&5
-echo $ECHO_N "checking whether $CC supports -no-cpp-precomp... $ECHO_C" >&6; }
-if test "${ac_cv_gcc_arg_no_cpp_precomp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -no-cpp-precomp" >&5
+$as_echo_n "checking whether $CC supports -no-cpp-precomp... " >&6; }
+if test "${ac_cv_gcc_arg_no_cpp_precomp+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
   echo 'void somefunc() { };' > conftest.c
@@ -4783,8 +5447,8 @@ else
   rm -f conftest.*
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_gcc_arg_no_cpp_precomp" >&5
-echo "${ECHO_T}$ac_cv_gcc_arg_no_cpp_precomp" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_arg_no_cpp_precomp" >&5
+$as_echo "$ac_cv_gcc_arg_no_cpp_precomp" >&6; }
   if eval test "\$$gcc_arg_name" = "yes"; then
     gcc_no_cpp_precomp=yes
   else
@@ -4964,22 +5628,22 @@ esac
 
 # Disable PIC mode by default where it is known to be safe to do so,
 # to avoid the performance hit from the lost register
-{ echo "$as_me:$LINENO: checking whether to force non-PIC code in shared modules" >&5
-echo $ECHO_N "checking whether to force non-PIC code in shared modules... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to force non-PIC code in shared modules" >&5
+$as_echo_n "checking whether to force non-PIC code in shared modules... " >&6; }
 case $host_alias in
   i?86-*-linux*|i?86-*-freebsd*)
     if test "${with_pic+set}" != "set" || test "$with_pic" = "no"; then
       with_pic=no
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     else
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
     ;;
   *)
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     ;;
 esac
 
@@ -4996,32 +5660,28 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: checking whether /dev/urandom exists" >&5
-echo $ECHO_N "checking whether /dev/urandom exists... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether /dev/urandom exists" >&5
+$as_echo_n "checking whether /dev/urandom exists... " >&6; }
 if test -r "/dev/urandom" && test -c "/dev/urandom"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DEV_URANDOM 1
-_ACEOF
+$as_echo "#define HAVE_DEV_URANDOM 1" >>confdefs.h
 
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  { echo "$as_me:$LINENO: checking whether /dev/arandom exists" >&5
-echo $ECHO_N "checking whether /dev/arandom exists... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether /dev/arandom exists" >&5
+$as_echo_n "checking whether /dev/arandom exists... " >&6; }
   if test -r "/dev/arandom" && test -c "/dev/arandom"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DEV_ARANDOM 1
-_ACEOF
+$as_echo "#define HAVE_DEV_ARANDOM 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -5064,7 +5724,7 @@ if test -n "$ac_cv_pthreads_cflags"; then
 fi
 
 
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
 
     pthreads_working=no
   case $host_alias in
@@ -5074,11 +5734,7 @@ if test "$cross_compiling" = yes; then
 
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <pthread.h>
@@ -5096,50 +5752,26 @@ int main() {
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
   pthreads_working=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
   pthreads_working=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
   LIBS=$save_LIBS
   CFLAGS=$save_CFLAGS
 
-  { echo "$as_me:$LINENO: checking for pthreads_cflags" >&5
-echo $ECHO_N "checking for pthreads_cflags... $ECHO_C" >&6; }
-if test "${ac_cv_pthreads_cflags+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5
+$as_echo_n "checking for pthreads_cflags... " >&6; }
+if test "${ac_cv_pthreads_cflags+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
   ac_cv_pthreads_cflags=
@@ -5148,7 +5780,7 @@ else
       ac_save=$CFLAGS
       CFLAGS="$CFLAGS $flag"
 
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
 
     pthreads_working=no
   case $host_alias in
@@ -5158,11 +5790,7 @@ if test "$cross_compiling" = yes; then
 
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <pthread.h>
@@ -5180,43 +5808,19 @@ int main() {
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
   pthreads_working=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
   pthreads_working=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
       CFLAGS=$ac_save
       if test "$pthreads_working" = "yes"; then
         ac_cv_pthreads_cflags=$flag
@@ -5227,13 +5831,13 @@ fi
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_pthreads_cflags" >&5
-echo "${ECHO_T}$ac_cv_pthreads_cflags" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags" >&5
+$as_echo "$ac_cv_pthreads_cflags" >&6; }
 
-{ echo "$as_me:$LINENO: checking for pthreads_lib" >&5
-echo $ECHO_N "checking for pthreads_lib... $ECHO_C" >&6; }
-if test "${ac_cv_pthreads_lib+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5
+$as_echo_n "checking for pthreads_lib... " >&6; }
+if test "${ac_cv_pthreads_lib+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 ac_cv_pthreads_lib=
@@ -5242,7 +5846,7 @@ if test "$pthreads_working" != "yes"; then
     ac_save=$LIBS
     LIBS="$LIBS -l$lib"
 
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
 
     pthreads_working=no
   case $host_alias in
@@ -5252,11 +5856,7 @@ if test "$cross_compiling" = yes; then
 
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <pthread.h>
@@ -5274,43 +5874,19 @@ int main() {
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
   pthreads_working=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
   pthreads_working=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_save
     if test "$pthreads_working" = "yes"; then
       ac_cv_pthreads_lib=$lib
@@ -5320,8 +5896,8 @@ fi
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_pthreads_lib" >&5
-echo "${ECHO_T}$ac_cv_pthreads_lib" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_lib" >&5
+$as_echo "$ac_cv_pthreads_lib" >&6; }
 
 if test "$pthreads_working" = "yes"; then
   threads_result="POSIX-Threads found"
@@ -5331,7 +5907,7 @@ fi
 
 
 # Check whether --enable- was given.
-if test "${enable_+set}" = set; then
+if test "${enable_+set}" = set; then :
   enableval=$enable_;
 fi
 
@@ -5393,10 +5969,10 @@ SAPI_STATIC=libs/libphp$PHP_MAJOR_VERSION.a
 SAPI_LIBTOOL=libphp$PHP_MAJOR_VERSION.la
 
 
-  { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-  { echo "$as_me:$LINENO: result: ${T_MD}Configuring SAPI modules${T_ME}" >&5
-echo "${ECHO_T}${T_MD}Configuring SAPI modules${T_ME}" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring SAPI modules${T_ME}" >&5
+$as_echo "${T_MD}Configuring SAPI modules${T_ME}" >&6; }
 
 
 
@@ -5407,7 +5983,7 @@ php_with_aolserver=no
 
 
 # Check whether --with-aolserver was given.
-if test "${with_aolserver+set}" = set; then
+if test "${with_aolserver+set}" = set; then :
   withval=$with_aolserver; PHP_AOLSERVER=$withval
 else
 
@@ -5423,29 +5999,23 @@ ext_output=$PHP_AOLSERVER
 
 
 
-{ echo "$as_me:$LINENO: checking for AOLserver support" >&5
-echo $ECHO_N "checking for AOLserver support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AOLserver support" >&5
+$as_echo_n "checking for AOLserver support... " >&6; }
 
 if test "$PHP_AOLSERVER" != "no"; then
   if test -d "$PHP_AOLSERVER/include"; then
     PHP_AOLSERVER_SRC=$PHP_AOLSERVER
   fi
   if test -z "$PHP_AOLSERVER_SRC" || test ! -d $PHP_AOLSERVER_SRC/include; then
-    { { echo "$as_me:$LINENO: error: Please specify the path to the source distribution of AOLserver using --with-aolserver-src=DIR" >&5
-echo "$as_me: error: Please specify the path to the source distribution of AOLserver using --with-aolserver-src=DIR" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Please specify the path to the source distribution of AOLserver using --with-aolserver-src=DIR" "$LINENO" 5
   fi
   if test ! -d $PHP_AOLSERVER/bin ; then
-    { { echo "$as_me:$LINENO: error: Please specify the path to the root of AOLserver using --with-aolserver=DIR" >&5
-echo "$as_me: error: Please specify the path to the root of AOLserver using --with-aolserver=DIR" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Please specify the path to the root of AOLserver using --with-aolserver=DIR" "$LINENO" 5
   fi
 
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
   fi
 
 
@@ -5455,10 +6025,10 @@ echo "$as_me: error: ZTS currently requires working POSIX threads. We were unabl
     ai_p=$PHP_AOLSERVER_SRC/include
   else
 
-    ep_dir="`echo $PHP_AOLSERVER_SRC/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_AOLSERVER_SRC/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_AOLSERVER_SRC/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_AOLSERVER_SRC/include"`
   fi
 
 
@@ -5480,31 +6050,20 @@ echo "$as_me: error: ZTS currently requires working POSIX threads. We were unabl
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AOLSERVER 1
-_ACEOF
+$as_echo "#define HAVE_AOLSERVER 1" >>confdefs.h
 
 
   if test "shared" = "program"; then
     PHP_BINARIES="$PHP_BINARIES aolserver"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=aolserver
   fi
@@ -5655,8 +6214,8 @@ EOF
   INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_AOLSERVER/bin/"
 fi
 
-{ echo "$as_me:$LINENO: result: $PHP_AOLSERVER" >&5
-echo "${ECHO_T}$PHP_AOLSERVER" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_AOLSERVER" >&5
+$as_echo "$PHP_AOLSERVER" >&6; }
 
 
 
@@ -5667,7 +6226,7 @@ php_with_apxs=no
 
 
 # Check whether --with-apxs was given.
-if test "${with_apxs+set}" = set; then
+if test "${with_apxs+set}" = set; then :
   withval=$with_apxs; PHP_APXS=$withval
 else
 
@@ -5683,8 +6242,8 @@ ext_output=$PHP_APXS
 
 
 
-{ echo "$as_me:$LINENO: checking for Apache 1.x module support via DSO through APXS" >&5
-echo $ECHO_N "checking for Apache 1.x module support via DSO through APXS... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Apache 1.x module support via DSO through APXS" >&5
+$as_echo_n "checking for Apache 1.x module support via DSO through APXS... " >&6; }
 
 if test "$PHP_APXS" != "no"; then
   if test "$PHP_APXS" = "yes"; then
@@ -5699,36 +6258,34 @@ if test "$PHP_APXS" != "no"; then
     APXS=$PHP_APXS
   else
 
-    ep_dir="`echo $PHP_APXS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_APXS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    APXS="$ep_realdir/`basename \"$PHP_APXS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    APXS="$ep_realdir"/`basename "$PHP_APXS"`
   fi
 
   fi
 
   $APXS -q CFLAGS >/dev/null 2>&1
   if test "$?" != "0"; then
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-    { echo "$as_me:$LINENO: result: Sorry, I was not able to successfully run APXS.  Possible reasons:" >&5
-echo "${ECHO_T}Sorry, I was not able to successfully run APXS.  Possible reasons:" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-    { echo "$as_me:$LINENO: result: 1.  Perl is not installed;" >&5
-echo "${ECHO_T}1.  Perl is not installed;" >&6; }
-    { echo "$as_me:$LINENO: result: 2.  Apache was not compiled with DSO support (--enable-module=so);" >&5
-echo "${ECHO_T}2.  Apache was not compiled with DSO support (--enable-module=so);" >&6; }
-    { echo "$as_me:$LINENO: result: 3.  'apxs' is not in your path.  Try to use --with-apxs=/path/to/apxs" >&5
-echo "${ECHO_T}3.  'apxs' is not in your path.  Try to use --with-apxs=/path/to/apxs" >&6; }
-    { echo "$as_me:$LINENO: result: The output of $APXS follows" >&5
-echo "${ECHO_T}The output of $APXS follows" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, I was not able to successfully run APXS.  Possible reasons:" >&5
+$as_echo "Sorry, I was not able to successfully run APXS.  Possible reasons:" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 1.  Perl is not installed;" >&5
+$as_echo "1.  Perl is not installed;" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.  Apache was not compiled with DSO support (--enable-module=so);" >&5
+$as_echo "2.  Apache was not compiled with DSO support (--enable-module=so);" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 3.  'apxs' is not in your path.  Try to use --with-apxs=/path/to/apxs" >&5
+$as_echo "3.  'apxs' is not in your path.  Try to use --with-apxs=/path/to/apxs" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: The output of $APXS follows" >&5
+$as_echo "The output of $APXS follows" >&6; }
     $APXS -q CFLAGS
-    { { echo "$as_me:$LINENO: error: Aborting" >&5
-echo "$as_me: error: Aborting" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Aborting" "$LINENO" 5
   fi
 
   APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@"
@@ -5749,9 +6306,7 @@ IFS="- /.
   APACHE_VERSION=`expr $4 \* 1000000 + $5 \* 1000 + $6`
 
   if test "$APACHE_VERSION" -ge 2000000; then
-    { { echo "$as_me:$LINENO: error: You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropiate switch --with-apxs2" >&5
-echo "$as_me: error: You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropiate switch --with-apxs2" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropriate switch --with-apxs2" "$LINENO" 5
   fi
 
   for flag in $APXS_CFLAGS; do
@@ -5784,23 +6339,14 @@ echo "$as_me: error: You have enabled Apache 1.3 support while your server is Ap
   if test "$build_type" = "program"; then
     PHP_BINARIES="$PHP_BINARIES apache"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=apache
   fi
@@ -5975,25 +6521,19 @@ EOF
   fi
   STRONGHOLD=
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AP_CONFIG_H 1
-_ACEOF
+$as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AP_COMPAT_H 1
-_ACEOF
+$as_echo "#define HAVE_AP_COMPAT_H 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_APACHE 1
-_ACEOF
+$as_echo "#define HAVE_APACHE 1" >>confdefs.h
 
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6002,7 +6542,7 @@ php_with_apache=no
 
 
 # Check whether --with-apache was given.
-if test "${with_apache+set}" = set; then
+if test "${with_apache+set}" = set; then :
   withval=$with_apache; PHP_APACHE=$withval
 else
 
@@ -6018,8 +6558,8 @@ ext_output=$PHP_APACHE
 
 
 
-{ echo "$as_me:$LINENO: checking for Apache 1.x module support" >&5
-echo $ECHO_N "checking for Apache 1.x module support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Apache 1.x module support" >&5
+$as_echo_n "checking for Apache 1.x module support... " >&6; }
 
 if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then
 
@@ -6031,9 +6571,7 @@ if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then
   APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php5.* sapi/apache/libphp5.module"
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_APACHE 1
-_ACEOF
+$as_echo "#define HAVE_APACHE 1" >>confdefs.h
 
   APACHE_MODULE=yes
 
@@ -6041,10 +6579,10 @@ _ACEOF
     PHP_APACHE=$PHP_APACHE
   else
 
-    ep_dir="`echo $PHP_APACHE|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_APACHE|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    PHP_APACHE="$ep_realdir/`basename \"$PHP_APACHE\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    PHP_APACHE="$ep_realdir"/`basename "$PHP_APACHE"`
   fi
 
   # For Apache 1.2.x
@@ -6055,23 +6593,14 @@ _ACEOF
   if test "static" = "program"; then
     PHP_BINARIES="$PHP_BINARIES apache"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=apache
   fi
@@ -6221,21 +6750,17 @@ EOF
 
     APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_INSTALL_FILES $APACHE_TARGET"
     PHP_LIBS="-L. -lphp3"
-    { echo "$as_me:$LINENO: result: yes - Apache 1.2.x" >&5
-echo "${ECHO_T}yes - Apache 1.2.x" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - Apache 1.2.x" >&5
+$as_echo "yes - Apache 1.2.x" >&6; }
     STRONGHOLD=
     if test -f $PHP_APACHE/src/ap_config.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AP_CONFIG_H 1
-_ACEOF
+$as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h
 
     fi
   # For Apache 2.0.x
   elif test -f $PHP_APACHE/include/httpd.h && test -f $PHP_APACHE/srclib/apr/include/apr_general.h ; then
-    { { echo "$as_me:$LINENO: error: Use --with-apxs2 with Apache 2.x!" >&5
-echo "$as_me: error: Use --with-apxs2 with Apache 2.x!" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Use --with-apxs2 with Apache 2.x!" "$LINENO" 5
   # For Apache 1.3.x
   elif test -f $PHP_APACHE/src/main/httpd.h; then
     APACHE_HAS_REGEX=1
@@ -6248,23 +6773,14 @@ echo "$as_me: error: Use --with-apxs2 with Apache 2.x!" >&2;}
   if test "static" = "program"; then
     PHP_BINARIES="$PHP_BINARIES apache"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=apache
   fi
@@ -6414,32 +6930,24 @@ EOF
 
     APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
     PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
-    { echo "$as_me:$LINENO: result: yes - Apache 1.3.x" >&5
-echo "${ECHO_T}yes - Apache 1.3.x" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - Apache 1.3.x" >&5
+$as_echo "yes - Apache 1.3.x" >&6; }
     STRONGHOLD=
     if test -f $PHP_APACHE/src/include/ap_config.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AP_CONFIG_H 1
-_ACEOF
+$as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h
 
     fi
     if test -f $PHP_APACHE/src/include/ap_compat.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AP_COMPAT_H 1
-_ACEOF
+$as_echo "#define HAVE_AP_COMPAT_H 1" >>confdefs.h
 
       if test ! -f $PHP_APACHE/src/include/ap_config_auto.h; then
-        { { echo "$as_me:$LINENO: error: Please run Apache\'s configure or src/Configure program once and try again" >&5
-echo "$as_me: error: Please run Apache\'s configure or src/Configure program once and try again" >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error "Please run Apache\'s configure or src/Configure program once and try again" "$LINENO" 5
       fi
     elif test -f $PHP_APACHE/src/include/compat.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OLD_COMPAT_H 1
-_ACEOF
+$as_echo "#define HAVE_OLD_COMPAT_H 1" >>confdefs.h
 
     fi
   # Also for Apache 1.3.x
@@ -6454,23 +6962,14 @@ _ACEOF
   if test "static" = "program"; then
     PHP_BINARIES="$PHP_BINARIES apache"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=apache
   fi
@@ -6620,32 +7119,24 @@ EOF
 
     PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
     APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
-    { echo "$as_me:$LINENO: result: yes - Apache 1.3.x" >&5
-echo "${ECHO_T}yes - Apache 1.3.x" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - Apache 1.3.x" >&5
+$as_echo "yes - Apache 1.3.x" >&6; }
     STRONGHOLD=
     if test -f $PHP_APACHE/src/include/ap_config.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AP_CONFIG_H 1
-_ACEOF
+$as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h
 
     fi
     if test -f $PHP_APACHE/src/include/ap_compat.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AP_COMPAT_H 1
-_ACEOF
+$as_echo "#define HAVE_AP_COMPAT_H 1" >>confdefs.h
 
       if test ! -f $PHP_APACHE/src/include/ap_config_auto.h; then
-        { { echo "$as_me:$LINENO: error: Please run Apache\'s configure or src/Configure program once and try again" >&5
-echo "$as_me: error: Please run Apache\'s configure or src/Configure program once and try again" >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error "Please run Apache\'s configure or src/Configure program once and try again" "$LINENO" 5
       fi
     elif test -f $PHP_APACHE/src/include/compat.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OLD_COMPAT_H 1
-_ACEOF
+$as_echo "#define HAVE_OLD_COMPAT_H 1" >>confdefs.h
 
     fi
   # For StrongHold 2.2
@@ -6656,23 +7147,14 @@ _ACEOF
   if test "static" = "program"; then
     PHP_BINARIES="$PHP_BINARIES apache"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=apache
   fi
@@ -6823,43 +7305,33 @@ EOF
     PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
     APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET"
     STRONGHOLD=-DSTRONGHOLD=1
-    { echo "$as_me:$LINENO: result: yes - StrongHold" >&5
-echo "${ECHO_T}yes - StrongHold" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - StrongHold" >&5
+$as_echo "yes - StrongHold" >&6; }
     if test -f $PHP_APACHE/apache/ap_config.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AP_CONFIG_H 1
-_ACEOF
+$as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h
 
     fi
     if test -f $PHP_APACHE/src/ap_compat.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AP_COMPAT_H 1
-_ACEOF
+$as_echo "#define HAVE_AP_COMPAT_H 1" >>confdefs.h
 
       if test ! -f $PHP_APACHE/src/include/ap_config_auto.h; then
-        { { echo "$as_me:$LINENO: error: Please run Apache\'s configure or src/Configure program once and try again" >&5
-echo "$as_me: error: Please run Apache\'s configure or src/Configure program once and try again" >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error "Please run Apache\'s configure or src/Configure program once and try again" "$LINENO" 5
       fi
     elif test -f $PHP_APACHE/src/compat.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OLD_COMPAT_H 1
-_ACEOF
+$as_echo "#define HAVE_OLD_COMPAT_H 1" >>confdefs.h
 
     fi
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-    { { echo "$as_me:$LINENO: error: Invalid Apache directory - unable to find httpd.h under $PHP_APACHE" >&5
-echo "$as_me: error: Invalid Apache directory - unable to find httpd.h under $PHP_APACHE" >&2;}
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    as_fn_error "Invalid Apache directory - unable to find httpd.h under $PHP_APACHE" "$LINENO" 5
   fi
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 # compatibility
@@ -6870,10 +7342,10 @@ fi
 
 php_enable_mod_charset=no
 
-{ echo "$as_me:$LINENO: checking whether to enable Apache charset compatibility option" >&5
-echo $ECHO_N "checking whether to enable Apache charset compatibility option... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Apache charset compatibility option" >&5
+$as_echo_n "checking whether to enable Apache charset compatibility option... " >&6; }
 # Check whether --enable-mod-charset was given.
-if test "${enable_mod_charset+set}" = set; then
+if test "${enable_mod_charset+set}" = set; then :
   enableval=$enable_mod_charset; PHP_MOD_CHARSET=$enableval
 else
 
@@ -6884,17 +7356,15 @@ fi
 
 
 ext_output=$PHP_MOD_CHARSET
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_MOD_CHARSET" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_TRANSFER_TABLES 1
-_ACEOF
+$as_echo "#define USE_TRANSFER_TABLES 1" >>confdefs.h
 
 fi
 
@@ -6903,10 +7373,10 @@ if test "$APACHE_MODULE" = "yes"; then
   if test -n "$GCC"; then
 
   gcc_arg_name=ac_cv_gcc_arg_rdynamic
-  { echo "$as_me:$LINENO: checking whether $CC supports -rdynamic" >&5
-echo $ECHO_N "checking whether $CC supports -rdynamic... $ECHO_C" >&6; }
-if test "${ac_cv_gcc_arg_rdynamic+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -rdynamic" >&5
+$as_echo_n "checking whether $CC supports -rdynamic... " >&6; }
+if test "${ac_cv_gcc_arg_rdynamic+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
   echo 'void somefunc() { };' > conftest.c
@@ -6920,8 +7390,8 @@ else
   rm -f conftest.*
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_gcc_arg_rdynamic" >&5
-echo "${ECHO_T}$ac_cv_gcc_arg_rdynamic" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_arg_rdynamic" >&5
+$as_echo "$ac_cv_gcc_arg_rdynamic" >&6; }
   if eval test "\$$gcc_arg_name" = "yes"; then
     gcc_rdynamic=yes
   else
@@ -6946,10 +7416,10 @@ if test -n "$APACHE_INSTALL"; then
   fi
 
 
-{ echo "$as_me:$LINENO: checking for member fd in BUFF *" >&5
-echo $ECHO_N "checking for member fd in BUFF *... $ECHO_C" >&6; }
-if test "${ac_cv_php_fd_in_buff+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for member fd in BUFF *" >&5
+$as_echo_n "checking for member fd in BUFF *... " >&6; }
+if test "${ac_cv_php_fd_in_buff+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
   save=$CPPFLAGS
@@ -6958,11 +7428,7 @@ else
   else
     CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE"
   fi
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <httpd.h>
 int
@@ -6973,43 +7439,21 @@ conn_rec *c; int fd = c->client->fd;
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
     ac_cv_php_fd_in_buff=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_php_fd_in_buff=no
+  ac_cv_php_fd_in_buff=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   CPPFLAGS=$save
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_php_fd_in_buff" >&5
-echo "${ECHO_T}$ac_cv_php_fd_in_buff" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_fd_in_buff" >&5
+$as_echo "$ac_cv_php_fd_in_buff" >&6; }
 if test "$ac_cv_php_fd_in_buff" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define PHP_APACHE_HAVE_CLIENT_FD 1
-_ACEOF
+$as_echo "#define PHP_APACHE_HAVE_CLIENT_FD 1" >>confdefs.h
 
 fi
 
@@ -7046,7 +7490,7 @@ php_with_apxs2filter=no
 
 
 # Check whether --with-apxs2filter was given.
-if test "${with_apxs2filter+set}" = set; then
+if test "${with_apxs2filter+set}" = set; then :
   withval=$with_apxs2filter; PHP_APXS2FILTER=$withval
 else
 
@@ -7062,8 +7506,8 @@ ext_output=$PHP_APXS2FILTER
 
 
 
-{ echo "$as_me:$LINENO: checking for Apache 2.0 filter-module support via DSO through APXS" >&5
-echo $ECHO_N "checking for Apache 2.0 filter-module support via DSO through APXS... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Apache 2.0 filter-module support via DSO through APXS" >&5
+$as_echo_n "checking for Apache 2.0 filter-module support via DSO through APXS... " >&6; }
 
 if test "$PHP_APXS2FILTER" != "no"; then
   if test "$PHP_APXS2FILTER" = "yes"; then
@@ -7078,38 +7522,36 @@ if test "$PHP_APXS2FILTER" != "no"; then
     APXS=$PHP_APXS2FILTER
   else
 
-    ep_dir="`echo $PHP_APXS2FILTER|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_APXS2FILTER|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    APXS="$ep_realdir/`basename \"$PHP_APXS2FILTER\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    APXS="$ep_realdir"/`basename "$PHP_APXS2FILTER"`
   fi
 
   fi
 
   $APXS -q CFLAGS >/dev/null 2>&1
   if test "$?" != "0"; then
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-    { echo "$as_me:$LINENO: result: Sorry, I cannot run apxs.  Possible reasons follow:" >&5
-echo "${ECHO_T}Sorry, I cannot run apxs.  Possible reasons follow:" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-    { echo "$as_me:$LINENO: result: 1. Perl is not installed" >&5
-echo "${ECHO_T}1. Perl is not installed" >&6; }
-    { echo "$as_me:$LINENO: result: 2. apxs was not found. Try to pass the path using --with-apxs2filter=/path/to/apxs" >&5
-echo "${ECHO_T}2. apxs was not found. Try to pass the path using --with-apxs2filter=/path/to/apxs" >&6; }
-    { echo "$as_me:$LINENO: result: 3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&5
-echo "${ECHO_T}3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-    { echo "$as_me:$LINENO: result: The output of $APXS follows:" >&5
-echo "${ECHO_T}The output of $APXS follows:" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, I cannot run apxs.  Possible reasons follow:" >&5
+$as_echo "Sorry, I cannot run apxs.  Possible reasons follow:" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 1. Perl is not installed" >&5
+$as_echo "1. Perl is not installed" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2. apxs was not found. Try to pass the path using --with-apxs2filter=/path/to/apxs" >&5
+$as_echo "2. apxs was not found. Try to pass the path using --with-apxs2filter=/path/to/apxs" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&5
+$as_echo "3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: The output of $APXS follows:" >&5
+$as_echo "The output of $APXS follows:" >&6; }
     $APXS -q CFLAGS
-    { { echo "$as_me:$LINENO: error: Aborting" >&5
-echo "$as_me: error: Aborting" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Aborting" "$LINENO" 5
   fi
 
   APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
@@ -7148,13 +7590,9 @@ IFS="- /.
   APACHE_VERSION=`expr $4 \* 1000000 + $5 \* 1000 + $6`
 
   if test "$APACHE_VERSION" -le 2000000; then
-    { { echo "$as_me:$LINENO: error: You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropiate switch --with-apxs (without the 2)" >&5
-echo "$as_me: error: You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropiate switch --with-apxs (without the 2)" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropriate switch --with-apxs (without the 2)" "$LINENO" 5
   elif test "$APACHE_VERSION" -lt 2000040; then
-    { { echo "$as_me:$LINENO: error: Please note that Apache version >= 2.0.40 is required" >&5
-echo "$as_me: error: Please note that Apache version >= 2.0.40 is required" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Please note that Apache version >= 2.0.40 is required" "$LINENO" 5
   fi
 
   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
@@ -7178,23 +7616,14 @@ echo "$as_me: error: Please note that Apache version >= 2.0.40 is required" >&2;
   if test "shared" = "program"; then
     PHP_BINARIES="$PHP_BINARIES apache2filter"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=apache2filter
   fi
@@ -7359,23 +7788,14 @@ EOF
   if test "bundle" = "program"; then
     PHP_BINARIES="$PHP_BINARIES apache2filter"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=apache2filter
   fi
@@ -7534,23 +7954,14 @@ EOF
   if test "shared" = "program"; then
     PHP_BINARIES="$PHP_BINARIES apache2filter"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=apache2filter
   fi
@@ -7705,23 +8116,14 @@ EOF
   if test "shared" = "program"; then
     PHP_BINARIES="$PHP_BINARIES apache2filter"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=apache2filter
   fi
@@ -7879,9 +8281,7 @@ EOF
 
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
   fi
 
     fi
@@ -7891,21 +8291,19 @@ echo "$as_me: error: ZTS currently requires working POSIX threads. We were unabl
 
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
   fi
 
     fi
   fi
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST APXS"
 
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -7916,7 +8314,7 @@ php_with_apxs2=no
 
 
 # Check whether --with-apxs2 was given.
-if test "${with_apxs2+set}" = set; then
+if test "${with_apxs2+set}" = set; then :
   withval=$with_apxs2; PHP_APXS2=$withval
 else
 
@@ -7932,8 +8330,8 @@ ext_output=$PHP_APXS2
 
 
 
-{ echo "$as_me:$LINENO: checking for Apache 2.0 handler-module support via DSO through APXS" >&5
-echo $ECHO_N "checking for Apache 2.0 handler-module support via DSO through APXS... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Apache 2.0 handler-module support via DSO through APXS" >&5
+$as_echo_n "checking for Apache 2.0 handler-module support via DSO through APXS... " >&6; }
 
 if test "$PHP_APXS2" != "no"; then
   if test "$PHP_APXS2" = "yes"; then
@@ -7948,38 +8346,36 @@ if test "$PHP_APXS2" != "no"; then
     APXS=$PHP_APXS2
   else
 
-    ep_dir="`echo $PHP_APXS2|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_APXS2|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    APXS="$ep_realdir/`basename \"$PHP_APXS2\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    APXS="$ep_realdir"/`basename "$PHP_APXS2"`
   fi
 
   fi
 
   $APXS -q CFLAGS >/dev/null 2>&1
   if test "$?" != "0"; then
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-    { echo "$as_me:$LINENO: result: Sorry, I cannot run apxs.  Possible reasons follow:" >&5
-echo "${ECHO_T}Sorry, I cannot run apxs.  Possible reasons follow:" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-    { echo "$as_me:$LINENO: result: 1. Perl is not installed" >&5
-echo "${ECHO_T}1. Perl is not installed" >&6; }
-    { echo "$as_me:$LINENO: result: 2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&5
-echo "${ECHO_T}2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&6; }
-    { echo "$as_me:$LINENO: result: 3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&5
-echo "${ECHO_T}3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-    { echo "$as_me:$LINENO: result: The output of $APXS follows:" >&5
-echo "${ECHO_T}The output of $APXS follows:" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, I cannot run apxs.  Possible reasons follow:" >&5
+$as_echo "Sorry, I cannot run apxs.  Possible reasons follow:" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 1. Perl is not installed" >&5
+$as_echo "1. Perl is not installed" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&5
+$as_echo "2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&5
+$as_echo "3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: The output of $APXS follows:" >&5
+$as_echo "The output of $APXS follows:" >&6; }
     $APXS -q CFLAGS
-    { { echo "$as_me:$LINENO: error: Aborting" >&5
-echo "$as_me: error: Aborting" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Aborting" "$LINENO" 5
   fi
 
   APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
@@ -8018,13 +8414,9 @@ IFS="- /.
   APACHE_VERSION=`expr $4 \* 1000000 + $5 \* 1000 + $6`
 
   if test "$APACHE_VERSION" -le 2000000; then
-    { { echo "$as_me:$LINENO: error: You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropiate switch --with-apxs (without the 2)" >&5
-echo "$as_me: error: You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropiate switch --with-apxs (without the 2)" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropriate switch --with-apxs (without the 2)" "$LINENO" 5
   elif test "$APACHE_VERSION" -lt 2000044; then
-    { { echo "$as_me:$LINENO: error: Please note that Apache version >= 2.0.44 is required" >&5
-echo "$as_me: error: Please note that Apache version >= 2.0.44 is required" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Please note that Apache version >= 2.0.44 is required" "$LINENO" 5
   fi
 
   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
@@ -8048,23 +8440,14 @@ echo "$as_me: error: Please note that Apache version >= 2.0.44 is required" >&2;
   if test "shared" = "program"; then
     PHP_BINARIES="$PHP_BINARIES apache2handler"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=apache2handler
   fi
@@ -8229,23 +8612,14 @@ EOF
   if test "bundle" = "program"; then
     PHP_BINARIES="$PHP_BINARIES apache2handler"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=apache2handler
   fi
@@ -8404,23 +8778,14 @@ EOF
   if test "shared" = "program"; then
     PHP_BINARIES="$PHP_BINARIES apache2handler"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=apache2handler
   fi
@@ -8575,23 +8940,14 @@ EOF
   if test "shared" = "program"; then
     PHP_BINARIES="$PHP_BINARIES apache2handler"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=apache2handler
   fi
@@ -8749,9 +9105,7 @@ EOF
 
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
   fi
 
     fi
@@ -8761,21 +9115,19 @@ echo "$as_me: error: ZTS currently requires working POSIX threads. We were unabl
 
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
   fi
 
     fi
   fi
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST APXS"
 
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -8787,7 +9139,7 @@ php_with_apache_hooks=no
 
 
 # Check whether --with-apache-hooks was given.
-if test "${with_apache_hooks+set}" = set; then
+if test "${with_apache_hooks+set}" = set; then :
   withval=$with_apache_hooks; PHP_APACHE_HOOKS=$withval
 else
 
@@ -8803,8 +9155,8 @@ ext_output=$PHP_APACHE_HOOKS
 
 
 
-{ echo "$as_me:$LINENO: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5
-echo $ECHO_N "checking for Apache 1.x (hooks) module support via DSO through APXS... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5
+$as_echo_n "checking for Apache 1.x (hooks) module support via DSO through APXS... " >&6; }
 
 if test "$PHP_APACHE_HOOKS" != "no"; then
   if test "$PHP_APACHE_HOOKS" = "yes"; then
@@ -8819,36 +9171,34 @@ if test "$PHP_APACHE_HOOKS" != "no"; then
     APXS=$PHP_APACHE_HOOKS
   else
 
-    ep_dir="`echo $PHP_APACHE_HOOKS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_APACHE_HOOKS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    APXS="$ep_realdir/`basename \"$PHP_APACHE_HOOKS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    APXS="$ep_realdir"/`basename "$PHP_APACHE_HOOKS"`
   fi
 
   fi
 
   $APXS -q CFLAGS >/dev/null 2>&1
   if test "$?" != "0"; then
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-    { echo "$as_me:$LINENO: result: Sorry, I was not able to successfully run APXS.  Possible reasons:" >&5
-echo "${ECHO_T}Sorry, I was not able to successfully run APXS.  Possible reasons:" >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-    { echo "$as_me:$LINENO: result: 1.  Perl is not installed;" >&5
-echo "${ECHO_T}1.  Perl is not installed;" >&6; }
-    { echo "$as_me:$LINENO: result: 2.  Apache was not compiled with DSO support (--enable-module=so);" >&5
-echo "${ECHO_T}2.  Apache was not compiled with DSO support (--enable-module=so);" >&6; }
-    { echo "$as_me:$LINENO: result: 3.  'apxs' is not in your path.  Try to use --with-apxs=/path/to/apxs" >&5
-echo "${ECHO_T}3.  'apxs' is not in your path.  Try to use --with-apxs=/path/to/apxs" >&6; }
-    { echo "$as_me:$LINENO: result: The output of $APXS follows" >&5
-echo "${ECHO_T}The output of $APXS follows" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, I was not able to successfully run APXS.  Possible reasons:" >&5
+$as_echo "Sorry, I was not able to successfully run APXS.  Possible reasons:" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 1.  Perl is not installed;" >&5
+$as_echo "1.  Perl is not installed;" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.  Apache was not compiled with DSO support (--enable-module=so);" >&5
+$as_echo "2.  Apache was not compiled with DSO support (--enable-module=so);" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 3.  'apxs' is not in your path.  Try to use --with-apxs=/path/to/apxs" >&5
+$as_echo "3.  'apxs' is not in your path.  Try to use --with-apxs=/path/to/apxs" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: The output of $APXS follows" >&5
+$as_echo "The output of $APXS follows" >&6; }
     $APXS -q CFLAGS
-    { { echo "$as_me:$LINENO: error: Aborting" >&5
-echo "$as_me: error: Aborting" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Aborting" "$LINENO" 5
   fi
 
   APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@"
@@ -8869,9 +9219,7 @@ IFS="- /.
   APACHE_VERSION=`expr $4 \* 1000000 + $5 \* 1000 + $6`
 
   if test "$APACHE_VERSION" -ge 2000000; then
-    { { echo "$as_me:$LINENO: error: You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropiate switch --with-apxs2" >&5
-echo "$as_me: error: You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropiate switch --with-apxs2" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropriate switch --with-apxs2" "$LINENO" 5
   fi
 
   for flag in $APXS_CFLAGS; do
@@ -8904,23 +9252,14 @@ echo "$as_me: error: You have enabled Apache 1.3 support while your server is Ap
   if test "$build_type" = "program"; then
     PHP_BINARIES="$PHP_BINARIES apache_hooks"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=apache_hooks
   fi
@@ -9095,25 +9434,19 @@ EOF
   fi
   STRONGHOLD=
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AP_CONFIG_H 1
-_ACEOF
+$as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AP_COMPAT_H 1
-_ACEOF
+$as_echo "#define HAVE_AP_COMPAT_H 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_APACHE_HOOKS 1
-_ACEOF
+$as_echo "#define HAVE_APACHE_HOOKS 1" >>confdefs.h
 
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -9122,7 +9455,7 @@ php_with_apache_hooks_static=no
 
 
 # Check whether --with-apache-hooks-static was given.
-if test "${with_apache_hooks_static+set}" = set; then
+if test "${with_apache_hooks_static+set}" = set; then :
   withval=$with_apache_hooks_static; PHP_APACHE_HOOKS_STATIC=$withval
 else
 
@@ -9138,8 +9471,8 @@ ext_output=$PHP_APACHE_HOOKS_STATIC
 
 
 
-{ echo "$as_me:$LINENO: checking for Apache 1.x (hooks) module support" >&5
-echo $ECHO_N "checking for Apache 1.x (hooks) module support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Apache 1.x (hooks) module support" >&5
+$as_echo_n "checking for Apache 1.x (hooks) module support... " >&6; }
 
 if test "$PHP_SAPI" != "apache" && test "$PHP_SAPI" != "apache_hooks" && test "$PHP_APACHE_HOOKS_STATIC" != "no"; then
 
@@ -9151,9 +9484,7 @@ if test "$PHP_SAPI" != "apache" && test "$PHP_SAPI" != "apache_hooks" && test "$
   APACHE_HOOKS_INSTALL_FILES="\$(srcdir)/sapi/apache_hooks/mod_php5.* sapi/apache_hooks/libphp5.module"
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_APACHE 1
-_ACEOF
+$as_echo "#define HAVE_APACHE 1" >>confdefs.h
 
   APACHE_HOOKS_MODULE=yes
 
@@ -9161,10 +9492,10 @@ _ACEOF
     PHP_APACHE_HOOKS_STATIC=$PHP_APACHE_HOOKS_STATIC
   else
 
-    ep_dir="`echo $PHP_APACHE_HOOKS_STATIC|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_APACHE_HOOKS_STATIC|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    PHP_APACHE_HOOKS_STATIC="$ep_realdir/`basename \"$PHP_APACHE_HOOKS_STATIC\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    PHP_APACHE_HOOKS_STATIC="$ep_realdir"/`basename "$PHP_APACHE_HOOKS_STATIC"`
   fi
 
   # For Apache 1.2.x
@@ -9175,23 +9506,14 @@ _ACEOF
   if test "static" = "program"; then
     PHP_BINARIES="$PHP_BINARIES apache_hooks"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=apache_hooks
   fi
@@ -9341,21 +9663,17 @@ EOF
 
     APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET"
     PHP_LIBS="-L. -lphp3"
-    { echo "$as_me:$LINENO: result: yes - Apache 1.2.x" >&5
-echo "${ECHO_T}yes - Apache 1.2.x" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - Apache 1.2.x" >&5
+$as_echo "yes - Apache 1.2.x" >&6; }
     STRONGHOLD=
     if test -f $PHP_APACHE_HOOKS_STATIC/src/ap_config.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AP_CONFIG_H 1
-_ACEOF
+$as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h
 
     fi
   # For Apache 2.0.x
   elif test -f $PHP_APACHE_HOOKS_STATIC/include/httpd.h && test -f $PHP_APACHE_HOOKS_STATIC/srclib/apr/include/apr_general.h ; then
-    { { echo "$as_me:$LINENO: error: Use --with-apxs2 with Apache 2.x!" >&5
-echo "$as_me: error: Use --with-apxs2 with Apache 2.x!" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Use --with-apxs2 with Apache 2.x!" "$LINENO" 5
   # For Apache 1.3.x
   elif test -f $PHP_APACHE_HOOKS_STATIC/src/main/httpd.h; then
     APACHE_HAS_REGEX=1
@@ -9368,23 +9686,14 @@ echo "$as_me: error: Use --with-apxs2 with Apache 2.x!" >&2;}
   if test "static" = "program"; then
     PHP_BINARIES="$PHP_BINARIES apache_hooks"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=apache_hooks
   fi
@@ -9534,32 +9843,24 @@ EOF
 
     APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache_hooks/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache_hooks/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
     PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
-    { echo "$as_me:$LINENO: result: yes - Apache 1.3.x" >&5
-echo "${ECHO_T}yes - Apache 1.3.x" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - Apache 1.3.x" >&5
+$as_echo "yes - Apache 1.3.x" >&6; }
     STRONGHOLD=
     if test -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AP_CONFIG_H 1
-_ACEOF
+$as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h
 
     fi
     if test -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_compat.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AP_COMPAT_H 1
-_ACEOF
+$as_echo "#define HAVE_AP_COMPAT_H 1" >>confdefs.h
 
       if test ! -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config_auto.h; then
-        { { echo "$as_me:$LINENO: error: Please run Apache\'s configure or src/Configure program once and try again" >&5
-echo "$as_me: error: Please run Apache\'s configure or src/Configure program once and try again" >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error "Please run Apache\'s configure or src/Configure program once and try again" "$LINENO" 5
       fi
     elif test -f $PHP_APACHE_HOOKS_STATIC/src/include/compat.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OLD_COMPAT_H 1
-_ACEOF
+$as_echo "#define HAVE_OLD_COMPAT_H 1" >>confdefs.h
 
     fi
   # Also for Apache 1.3.x
@@ -9574,23 +9875,14 @@ _ACEOF
   if test "static" = "program"; then
     PHP_BINARIES="$PHP_BINARIES apache_hooks"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=apache_hooks
   fi
@@ -9740,32 +10032,24 @@ EOF
 
     PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
     APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache_hooks/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache_hooks/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
-    { echo "$as_me:$LINENO: result: yes - Apache 1.3.x" >&5
-echo "${ECHO_T}yes - Apache 1.3.x" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - Apache 1.3.x" >&5
+$as_echo "yes - Apache 1.3.x" >&6; }
     STRONGHOLD=
     if test -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AP_CONFIG_H 1
-_ACEOF
+$as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h
 
     fi
     if test -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_compat.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AP_COMPAT_H 1
-_ACEOF
+$as_echo "#define HAVE_AP_COMPAT_H 1" >>confdefs.h
 
       if test ! -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config_auto.h; then
-        { { echo "$as_me:$LINENO: error: Please run Apache\'s configure or src/Configure program once and try again" >&5
-echo "$as_me: error: Please run Apache\'s configure or src/Configure program once and try again" >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error "Please run Apache\'s configure or src/Configure program once and try again" "$LINENO" 5
       fi
     elif test -f $PHP_APACHE_HOOKS_STATIC/src/include/compat.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OLD_COMPAT_H 1
-_ACEOF
+$as_echo "#define HAVE_OLD_COMPAT_H 1" >>confdefs.h
 
     fi
   # For StrongHold 2.2
@@ -9776,23 +10060,14 @@ _ACEOF
   if test "static" = "program"; then
     PHP_BINARIES="$PHP_BINARIES apache_hooks"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=apache_hooks
   fi
@@ -9943,43 +10218,33 @@ EOF
     PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
     APACHE_HOOKS_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_HOOKS_INSTALL_FILES $APACHE_TARGET"
     STRONGHOLD=-DSTRONGHOLD=1
-    { echo "$as_me:$LINENO: result: yes - StrongHold" >&5
-echo "${ECHO_T}yes - StrongHold" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - StrongHold" >&5
+$as_echo "yes - StrongHold" >&6; }
     if test -f $PHP_APACHE_HOOKS_STATIC/apache/ap_config.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AP_CONFIG_H 1
-_ACEOF
+$as_echo "#define HAVE_AP_CONFIG_H 1" >>confdefs.h
 
     fi
     if test -f $PHP_APACHE_HOOKS_STATIC/src/ap_compat.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AP_COMPAT_H 1
-_ACEOF
+$as_echo "#define HAVE_AP_COMPAT_H 1" >>confdefs.h
 
       if test ! -f $PHP_APACHE_HOOKS_STATIC/src/include/ap_config_auto.h; then
-        { { echo "$as_me:$LINENO: error: Please run Apache\'s configure or src/Configure program once and try again" >&5
-echo "$as_me: error: Please run Apache\'s configure or src/Configure program once and try again" >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error "Please run Apache\'s configure or src/Configure program once and try again" "$LINENO" 5
       fi
     elif test -f $PHP_APACHE_HOOKS_STATIC/src/compat.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OLD_COMPAT_H 1
-_ACEOF
+$as_echo "#define HAVE_OLD_COMPAT_H 1" >>confdefs.h
 
     fi
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-    { { echo "$as_me:$LINENO: error: Invalid Apache directory - unable to find httpd.h under $PHP_APACHE_HOOKS_STATIC" >&5
-echo "$as_me: error: Invalid Apache directory - unable to find httpd.h under $PHP_APACHE_HOOKS_STATIC" >&2;}
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    as_fn_error "Invalid Apache directory - unable to find httpd.h under $PHP_APACHE_HOOKS_STATIC" "$LINENO" 5
   fi
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 # compatibility
@@ -9990,10 +10255,10 @@ fi
 
 php_enable_mod_charset=no
 
-{ echo "$as_me:$LINENO: checking whether to enable Apache charset compatibility option" >&5
-echo $ECHO_N "checking whether to enable Apache charset compatibility option... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Apache charset compatibility option" >&5
+$as_echo_n "checking whether to enable Apache charset compatibility option... " >&6; }
 # Check whether --enable-mod-charset was given.
-if test "${enable_mod_charset+set}" = set; then
+if test "${enable_mod_charset+set}" = set; then :
   enableval=$enable_mod_charset; PHP_MOD_CHARSET=$enableval
 else
 
@@ -10004,17 +10269,15 @@ fi
 
 
 ext_output=$PHP_MOD_CHARSET
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_MOD_CHARSET" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_TRANSFER_TABLES 1
-_ACEOF
+$as_echo "#define USE_TRANSFER_TABLES 1" >>confdefs.h
 
 fi
 
@@ -10023,10 +10286,10 @@ if test "$APACHE_HOOKS_MODULE" = "yes"; then
   if test -n "$GCC"; then
 
   gcc_arg_name=ac_cv_gcc_arg_rdynamic
-  { echo "$as_me:$LINENO: checking whether $CC supports -rdynamic" >&5
-echo $ECHO_N "checking whether $CC supports -rdynamic... $ECHO_C" >&6; }
-if test "${ac_cv_gcc_arg_rdynamic+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -rdynamic" >&5
+$as_echo_n "checking whether $CC supports -rdynamic... " >&6; }
+if test "${ac_cv_gcc_arg_rdynamic+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
   echo 'void somefunc() { };' > conftest.c
@@ -10040,8 +10303,8 @@ else
   rm -f conftest.*
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_gcc_arg_rdynamic" >&5
-echo "${ECHO_T}$ac_cv_gcc_arg_rdynamic" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_arg_rdynamic" >&5
+$as_echo "$ac_cv_gcc_arg_rdynamic" >&6; }
   if eval test "\$$gcc_arg_name" = "yes"; then
     gcc_rdynamic=yes
   else
@@ -10066,10 +10329,10 @@ if test -n "$APACHE_HOOKS_INSTALL"; then
   fi
 
 
-{ echo "$as_me:$LINENO: checking for member fd in BUFF *" >&5
-echo $ECHO_N "checking for member fd in BUFF *... $ECHO_C" >&6; }
-if test "${ac_cv_php_fd_in_buff+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for member fd in BUFF *" >&5
+$as_echo_n "checking for member fd in BUFF *... " >&6; }
+if test "${ac_cv_php_fd_in_buff+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
   save=$CPPFLAGS
@@ -10078,11 +10341,7 @@ else
   else
     CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE"
   fi
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <httpd.h>
 int
@@ -10093,43 +10352,21 @@ conn_rec *c; int fd = c->client->fd;
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
     ac_cv_php_fd_in_buff=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_php_fd_in_buff=no
+  ac_cv_php_fd_in_buff=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   CPPFLAGS=$save
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_php_fd_in_buff" >&5
-echo "${ECHO_T}$ac_cv_php_fd_in_buff" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_fd_in_buff" >&5
+$as_echo "$ac_cv_php_fd_in_buff" >&6; }
 if test "$ac_cv_php_fd_in_buff" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define PHP_APACHE_HAVE_CLIENT_FD 1
-_ACEOF
+$as_echo "#define PHP_APACHE_HAVE_CLIENT_FD 1" >>confdefs.h
 
 fi
 
@@ -10167,7 +10404,7 @@ php_with_caudium=no
 
 
 # Check whether --with-caudium was given.
-if test "${with_caudium+set}" = set; then
+if test "${with_caudium+set}" = set; then :
   withval=$with_caudium; PHP_CAUDIUM=$withval
 else
 
@@ -10183,8 +10420,8 @@ ext_output=$PHP_CAUDIUM
 
 
 
-{ echo "$as_me:$LINENO: checking for Caudium support" >&5
-echo $ECHO_N "checking for Caudium support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Caudium support" >&5
+$as_echo_n "checking for Caudium support... " >&6; }
 
 if test "$PHP_CAUDIUM" != "no"; then
   if test "$prefix" = "NONE"; then CPREF=/usr/local/; fi
@@ -10200,20 +10437,16 @@ if test "$PHP_CAUDIUM" != "no"; then
   elif test -f $PHP_CAUDIUM/bin/pike; then
     PIKE=$PHP_CAUDIUM/bin/pike
   else
-    { { echo "$as_me:$LINENO: error: Could not find a pike in $PHP_CAUDIUM/bin/" >&5
-echo "$as_me: error: Could not find a pike in $PHP_CAUDIUM/bin/" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Could not find a pike in $PHP_CAUDIUM/bin/" "$LINENO" 5
   fi
   if $PIKE -e 'float v; int rel;sscanf(version(), "Pike v%f release %d", v, rel);v += rel/10000.0; if(v < 7.0268) exit(1); exit(0);'; then
     PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Module' | sed -e 's/.*: //'`
     PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,' `
     if test -z "$PIKE_INCLUDE_DIR" || test -z "$PIKE_MODULE_DIR"; then
-      { { echo "$as_me:$LINENO: error: Failed to figure out Pike module and include directories" >&5
-echo "$as_me: error: Failed to figure out Pike module and include directories" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Failed to figure out Pike module and include directories" "$LINENO" 5
     fi
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     PIKE=`echo $PIKE | pike -e 'int tries=100;
        string orig,pike=Stdio.File("stdin")->read()-"\n";
        orig=pike;
@@ -10229,10 +10462,10 @@ echo "${ECHO_T}yes" >&6; }
     ai_p=$PIKE_INCLUDE_DIR
   else
 
-    ep_dir="`echo $PIKE_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PIKE_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PIKE_INCLUDE_DIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PIKE_INCLUDE_DIR"`
   fi
 
 
@@ -10258,8 +10491,8 @@ echo "${ECHO_T}yes" >&6; }
     else
       PIKE_C_INCLUDE=/usr/local/include/`basename $PIKE`
     fi
-    { echo "$as_me:$LINENO: checking for C includes in $PIKE_C_INCLUDE" >&5
-echo $ECHO_N "checking for C includes in $PIKE_C_INCLUDE... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C includes in $PIKE_C_INCLUDE" >&5
+$as_echo_n "checking for C includes in $PIKE_C_INCLUDE... " >&6; }
     if test -f $PIKE_C_INCLUDE/version.h; then
       PIKE_TEST_VER=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'`
       ###### VERSION MATCH CHECK #######
@@ -10289,10 +10522,10 @@ echo $ECHO_N "checking for C includes in $PIKE_C_INCLUDE... $ECHO_C" >&6; }
     ai_p=$PIKE_C_INCLUDE
   else
 
-    ep_dir="`echo $PIKE_C_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PIKE_C_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PIKE_C_INCLUDE\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PIKE_C_INCLUDE"`
   fi
 
 
@@ -10314,48 +10547,35 @@ echo $ECHO_N "checking for C includes in $PIKE_C_INCLUDE... $ECHO_C" >&6; }
   fi
 
         PIKE_INCLUDE_DIR="$PIKE_INCLUDE_DIR, $PIKE_C_INCLUDE"
-        { echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
       else
-        { echo "$as_me:$LINENO: result: version mismatch" >&5
-echo "${ECHO_T}version mismatch" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: version mismatch" >&5
+$as_echo "version mismatch" >&6; }
       fi
     else
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
     fi
   else
-    { { echo "$as_me:$LINENO: error: Caudium PHP5 requires Pike 7.0 or newer" >&5
-echo "$as_me: error: Caudium PHP5 requires Pike 7.0 or newer" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Caudium PHP5 requires Pike 7.0 or newer" "$LINENO" 5
   fi
   PIKE_VERSION=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'`
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CAUDIUM 1
-_ACEOF
+$as_echo "#define HAVE_CAUDIUM 1" >>confdefs.h
 
 
   if test "shared" = "program"; then
     PHP_BINARIES="$PHP_BINARIES caudium"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=caudium
   fi
@@ -10510,14 +10730,12 @@ EOF
 
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
   fi
 
 fi
-{ echo "$as_me:$LINENO: result: $RESULT" >&5
-echo "${ECHO_T}$RESULT" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $RESULT" >&5
+$as_echo "$RESULT" >&6; }
 
 
 
@@ -10526,7 +10744,7 @@ php_enable_cli=yes
 
 
 # Check whether --enable-cli was given.
-if test "${enable_cli+set}" = set; then
+if test "${enable_cli+set}" = set; then :
   enableval=$enable_cli; PHP_CLI=$enableval
 else
 
@@ -10542,8 +10760,8 @@ ext_output=$PHP_CLI
 
 
 
-{ echo "$as_me:$LINENO: checking for CLI build" >&5
-echo $ECHO_N "checking for CLI build... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLI build" >&5
+$as_echo_n "checking for CLI build... " >&6; }
 if test "$PHP_CLI" != "no"; then
 
   src=$abs_srcdir/sapi/cli/Makefile.frag
@@ -10558,23 +10776,14 @@ if test "$PHP_CLI" != "no"; then
   if test "program" = "program"; then
     PHP_BINARIES="$PHP_BINARIES cli"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=cli
   fi
@@ -10713,18 +10922,18 @@ EOF
 
 
 fi
-{ echo "$as_me:$LINENO: result: $PHP_CLI" >&5
-echo "${ECHO_T}$PHP_CLI" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_CLI" >&5
+$as_echo "$PHP_CLI" >&6; }
 
 
 
 php_with_continuity=no
 
-{ echo "$as_me:$LINENO: checking for Continuity support" >&5
-echo $ECHO_N "checking for Continuity support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Continuity support" >&5
+$as_echo_n "checking for Continuity support... " >&6; }
 
 # Check whether --with-continuity was given.
-if test "${with_continuity+set}" = set; then
+if test "${with_continuity+set}" = set; then :
   withval=$with_continuity; PHP_CONTINUITY=$withval
 else
 
@@ -10735,51 +10944,38 @@ fi
 
 
 ext_output=$PHP_CONTINUITY
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_CONTINUITY" != "no"; then
   if test ! -d $PHP_CONTINUITY; then
-    { { echo "$as_me:$LINENO: error: Please specify the path to the root of your Continuity server using --with-continuity=DIR" >&5
-echo "$as_me: error: Please specify the path to the root of your Continuity server using --with-continuity=DIR" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Please specify the path to the root of your Continuity server using --with-continuity=DIR" "$LINENO" 5
   fi
-  { echo "$as_me:$LINENO: checking for Continuity include files" >&5
-echo $ECHO_N "checking for Continuity include files... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Continuity include files" >&5
+$as_echo_n "checking for Continuity include files... " >&6; }
   if test -d $PHP_CONTINUITY/include ; then
     CAPI_INCLUDE=$PHP_CONTINUITY/include
-    { echo "$as_me:$LINENO: result: Continuity Binary Distribution" >&5
-echo "${ECHO_T}Continuity Binary Distribution" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Continuity Binary Distribution" >&5
+$as_echo "Continuity Binary Distribution" >&6; }
   else
-    { { echo "$as_me:$LINENO: error: Cannot find your CAPI include files in either DIR/src or DIR/include" >&5
-echo "$as_me: error: Cannot find your CAPI include files in either DIR/src or DIR/include" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Cannot find your CAPI include files in either DIR/src or DIR/include" "$LINENO" 5
   fi
 
 
   if test "shared" = "program"; then
     PHP_BINARIES="$PHP_BINARIES continuity"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=continuity
   fi
@@ -10934,10 +11130,10 @@ EOF
     ai_p=$CAPI_INCLUDE
   else
 
-    ep_dir="`echo $CAPI_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $CAPI_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$CAPI_INCLUDE\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$CAPI_INCLUDE"`
   fi
 
 
@@ -10961,15 +11157,11 @@ EOF
 
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CONTINUITY 1
-_ACEOF
+$as_echo "#define HAVE_CONTINUITY 1" >>confdefs.h
 
   INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_CONTINUITY/lib/"
 fi
@@ -10981,7 +11173,7 @@ php_enable_embed=no
 
 
 # Check whether --enable-embed was given.
-if test "${enable_embed+set}" = set; then
+if test "${enable_embed+set}" = set; then :
   enableval=$enable_embed; PHP_EMBED=$enableval
 else
 
@@ -10997,8 +11189,8 @@ ext_output=$PHP_EMBED
 
 
 
-{ echo "$as_me:$LINENO: checking for embedded SAPI library support" >&5
-echo $ECHO_N "checking for embedded SAPI library support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for embedded SAPI library support" >&5
+$as_echo_n "checking for embedded SAPI library support... " >&6; }
 
 if test "$PHP_EMBED" != "no"; then
   case "$PHP_EMBED" in
@@ -11019,23 +11211,14 @@ if test "$PHP_EMBED" != "no"; then
   if test "$PHP_EMBED_TYPE" = "program"; then
     PHP_BINARIES="$PHP_BINARIES embed"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=embed
   fi
@@ -11202,11 +11385,11 @@ EOF
 
 
   fi
-  { echo "$as_me:$LINENO: result: $PHP_EMBED_TYPE" >&5
-echo "${ECHO_T}$PHP_EMBED_TYPE" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_EMBED_TYPE" >&5
+$as_echo "$PHP_EMBED_TYPE" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -11216,7 +11399,7 @@ php_enable_fpm=no
 
 
 # Check whether --enable-fpm was given.
-if test "${enable_fpm+set}" = set; then
+if test "${enable_fpm+set}" = set; then :
   enableval=$enable_fpm; PHP_FPM=$enableval
 else
 
@@ -11261,364 +11444,34 @@ ext_output=$PHP_FPM
 
 
 
-{ echo "$as_me:$LINENO: checking for FPM build" >&5
-echo $ECHO_N "checking for FPM build... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FPM build" >&5
+$as_echo_n "checking for FPM build... " >&6; }
 if test "$PHP_FPM" != "no"; then
-  { echo "$as_me:$LINENO: result: $PHP_FPM" >&5
-echo "${ECHO_T}$PHP_FPM" >&6; }
-
-  { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_FPM" >&5
+$as_echo "$PHP_FPM" >&6; }
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.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
-rm -f -r conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.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
-rm -f -r conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define 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
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# 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=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  for ac_func in setenv clearenv setproctitle
+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"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
-
 done
 
 
-
-
-
-
-for ac_func in setenv clearenv setproctitle
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-  { echo "$as_me:$LINENO: checking for library containing socket" >&5
-echo $ECHO_N "checking for library containing socket... $ECHO_C" >&6; }
-if test "${ac_cv_search_socket+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
+$as_echo_n "checking for library containing socket... " >&6; }
+if test "${ac_cv_search_socket+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -11643,65 +11496,38 @@ for ac_lib in '' socket; do
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_socket=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_socket+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_socket+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_socket+set}" = set; then
-  :
+if test "${ac_cv_search_socket+set}" = set; then :
+
 else
   ac_cv_search_socket=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5
-echo "${ECHO_T}$ac_cv_search_socket" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
+$as_echo "$ac_cv_search_socket" >&6; }
 ac_res=$ac_cv_search_socket
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-  { echo "$as_me:$LINENO: checking for library containing inet_addr" >&5
-echo $ECHO_N "checking for library containing inet_addr... $ECHO_C" >&6; }
-if test "${ac_cv_search_inet_addr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_addr" >&5
+$as_echo_n "checking for library containing inet_addr... " >&6; }
+if test "${ac_cv_search_inet_addr+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -11726,617 +11552,80 @@ for ac_lib in '' nsl; do
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_inet_addr=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_inet_addr+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_inet_addr+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_inet_addr+set}" = set; then
-  :
+if test "${ac_cv_search_inet_addr+set}" = set; then :
+
 else
   ac_cv_search_inet_addr=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_inet_addr" >&5
-echo "${ECHO_T}$ac_cv_search_inet_addr" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_addr" >&5
+$as_echo "$ac_cv_search_inet_addr" >&6; }
 ac_res=$ac_cv_search_inet_addr
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 
-
-
-
-
-
-
-for ac_header in errno.h fcntl.h stdio.h stdlib.h unistd.h sys/uio.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  for ac_header in errno.h fcntl.h stdio.h stdlib.h unistd.h sys/uio.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"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-
-
-
-for ac_header in sys/select.h sys/socket.h sys/time.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  for ac_header in sys/select.h sys/socket.h sys/time.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"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-
-
-for ac_header in arpa/inet.h netinet/in.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  for ac_header in arpa/inet.h netinet/in.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"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-
-for ac_header in sysexits.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  for ac_header in sysexits.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sysexits.h" "ac_cv_header_sysexits_h" "$ac_includes_default"
+if test "x$ac_cv_header_sysexits_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_SYSEXITS_H 1
 _ACEOF
 
 fi
@@ -12345,14 +11634,10 @@ done
 
 
 
-  { echo "$as_me:$LINENO: checking for prctl" >&5
-echo $ECHO_N "checking for prctl... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prctl" >&5
+$as_echo_n "checking for prctl... " >&6; }
 
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
  #include <sys/prctl.h>
 int
@@ -12363,55 +11648,29 @@ prctl(0, 0, 0, 0, 0);
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PRCTL 1
-_ACEOF
+$as_echo "#define HAVE_PRCTL 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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.$ac_ext
 
 
   have_clock_gettime=no
 
-  { echo "$as_me:$LINENO: checking for clock_gettime" >&5
-echo $ECHO_N "checking for clock_gettime... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime" >&5
+$as_echo_n "checking for clock_gettime... " >&6; }
 
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
  #include <time.h>
 int
@@ -12422,54 +11681,29 @@ struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_clock_gettime=yes
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
   if test "$have_clock_gettime" = "no"; then
-    { echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5
-echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
+$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
 
     SAVED_LIBS="$LIBS"
     LIBS="$LIBS -lrt"
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
  #include <time.h>
 int
@@ -12480,70 +11714,42 @@ struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
 
       have_clock_gettime=yes
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
       LIBS="$SAVED_LIBS"
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   fi
 
   if test "$have_clock_gettime" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CLOCK_GETTIME 1
-_ACEOF
+$as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
 
   fi
 
   have_clock_get_time=no
 
   if test "$have_clock_gettime" = "no"; then
-    { echo "$as_me:$LINENO: checking for clock_get_time" >&5
-echo $ECHO_N "checking for clock_get_time... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_get_time" >&5
+$as_echo_n "checking for clock_get_time... " >&6; }
 
-    if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+    if test "$cross_compiling" = yes; then :
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run test program while cross compiling
+See \`config.log' for more details." "$LINENO" 5; }
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
  #include <mach/mach.h>
       #include <mach/clock.h>
@@ -12567,53 +11773,27 @@ cat >>conftest.$ac_ext <<_ACEOF
       }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
       have_clock_get_time=yes
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
   fi
 
   if test "$have_clock_get_time" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CLOCK_GET_TIME 1
-_ACEOF
+$as_echo "#define HAVE_CLOCK_GET_TIME 1" >>confdefs.h
 
   fi
 
@@ -12621,14 +11801,10 @@ _ACEOF
   have_ptrace=no
   have_broken_ptrace=no
 
-  { echo "$as_me:$LINENO: checking for ptrace" >&5
-echo $ECHO_N "checking for ptrace... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ptrace" >&5
+$as_echo_n "checking for ptrace... " >&6; }
 
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
     #include <sys/types.h>
@@ -12641,55 +11817,31 @@ ptrace(0, 0, (void *) 0, 0);
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
     have_ptrace=yes
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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.$ac_ext
 
   if test "$have_ptrace" = "yes"; then
-    { echo "$as_me:$LINENO: checking whether ptrace works" >&5
-echo $ECHO_N "checking whether ptrace works... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ptrace works" >&5
+$as_echo_n "checking whether ptrace works... " >&6; }
 
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
 
-      { echo "$as_me:$LINENO: result: skipped (cross compiling)" >&5
-echo "${ECHO_T}skipped (cross compiling)" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipped (cross compiling)" >&5
+$as_echo "skipped (cross compiling)" >&6; }
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
       #include <unistd.h>
@@ -12760,68 +11912,38 @@ cat >>conftest.$ac_ext <<_ACEOF
       }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
       have_ptrace=no
       have_broken_ptrace=yes
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
   fi
 
   if test "$have_ptrace" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PTRACE 1
-_ACEOF
+$as_echo "#define HAVE_PTRACE 1" >>confdefs.h
 
   fi
 
   have_mach_vm_read=no
 
   if test "$have_broken_ptrace" = "yes"; then
-    { echo "$as_me:$LINENO: checking for mach_vm_read" >&5
-echo $ECHO_N "checking for mach_vm_read... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mach_vm_read" >&5
+$as_echo_n "checking for mach_vm_read... " >&6; }
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
  #include <mach/mach.h>
       #include <mach/mach_vm.h>
@@ -12836,46 +11958,24 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
       have_mach_vm_read=yes
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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.$ac_ext
   fi
 
   if test "$have_mach_vm_read" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MACH_VM_READ 1
-_ACEOF
+$as_echo "#define HAVE_MACH_VM_READ 1" >>confdefs.h
 
   fi
 
@@ -12890,20 +11990,16 @@ _ACEOF
   fi
 
   if test -n "$proc_mem_file" ; then
-    { echo "$as_me:$LINENO: checking for proc mem file" >&5
-echo $ECHO_N "checking for proc mem file... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for proc mem file" >&5
+$as_echo_n "checking for proc mem file... " >&6; }
 
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
 
-      { echo "$as_me:$LINENO: result: skipped (cross compiling)" >&5
-echo "${ECHO_T}skipped (cross compiling)" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipped (cross compiling)" >&5
+$as_echo "skipped (cross compiling)" >&6; }
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
       #define _GNU_SOURCE
@@ -12933,46 +12029,22 @@ cat >>conftest.$ac_ext <<_ACEOF
       }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
-      { echo "$as_me:$LINENO: result: $proc_mem_file" >&5
-echo "${ECHO_T}$proc_mem_file" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $proc_mem_file" >&5
+$as_echo "$proc_mem_file" >&6; }
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
       proc_mem_file=""
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
   fi
 
   if test -n "$proc_mem_file"; then
@@ -12995,19 +12067,15 @@ _ACEOF
     fpm_trace_type=mach
 
   else
-    { echo "$as_me:$LINENO: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&5
-echo "$as_me: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&5
+$as_echo "$as_me: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&2;}
   fi
 
 
 
-  { echo "$as_me:$LINENO: checking if gcc supports __sync_bool_compare_and_swap" >&5
-echo $ECHO_N "checking if gcc supports __sync_bool_compare_and_swap... $ECHO_C" >&6; }
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc supports __sync_bool_compare_and_swap" >&5
+$as_echo_n "checking if gcc supports __sync_bool_compare_and_swap... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -13022,57 +12090,30 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BUILTIN_ATOMIC 1
-_ACEOF
+$as_echo "#define HAVE_BUILTIN_ATOMIC 1" >>confdefs.h
 
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 
   have_lq=no
 
-  { echo "$as_me:$LINENO: checking for TCP_INFO" >&5
-echo $ECHO_N "checking for TCP_INFO... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TCP_INFO" >&5
+$as_echo_n "checking for TCP_INFO... " >&6; }
 
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
  #include <netinet/tcp.h>
 int
@@ -13083,57 +12124,31 @@ struct tcp_info ti; int x = TCP_INFO;
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
     have_lq=tcp_info
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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.$ac_ext
 
   if test "$have_lq" = "tcp_info"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LQ_TCP_INFO 1
-_ACEOF
+$as_echo "#define HAVE_LQ_TCP_INFO 1" >>confdefs.h
 
   fi
 
   if test "$have_lq" = "no" ; then
-    { echo "$as_me:$LINENO: checking for SO_LISTENQLEN" >&5
-echo $ECHO_N "checking for SO_LISTENQLEN... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SO_LISTENQLEN" >&5
+$as_echo_n "checking for SO_LISTENQLEN... " >&6; }
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
  #include <sys/socket.h>
 int
@@ -13144,58 +12159,32 @@ int x = SO_LISTENQLIMIT; int y = SO_LISTENQLEN;
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
       have_lq=so_listenq
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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.$ac_ext
 
     if test "$have_lq" = "tcp_info"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LQ_SO_LISTENQ 1
-_ACEOF
+$as_echo "#define HAVE_LQ_SO_LISTENQ 1" >>confdefs.h
 
     fi
   fi
 
 
-	{ echo "$as_me:$LINENO: checking for sysconf" >&5
-echo $ECHO_N "checking for sysconf... $ECHO_C" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysconf" >&5
+$as_echo_n "checking for sysconf... " >&6; }
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
  #include <unistd.h>
 int
@@ -13206,53 +12195,27 @@ sysconf(_SC_CLK_TCK);
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYSCONF 1
-_ACEOF
+$as_echo "#define HAVE_SYSCONF 1" >>confdefs.h
 
-		{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
-		{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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.$ac_ext
 
 
-	{ echo "$as_me:$LINENO: checking for times" >&5
-echo $ECHO_N "checking for times... $ECHO_C" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for times" >&5
+$as_echo_n "checking for times... " >&6; }
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
  #include <sys/times.h>
 int
@@ -13263,53 +12226,27 @@ struct tms t; times(&t);
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_TIMES 1
-_ACEOF
+$as_echo "#define HAVE_TIMES 1" >>confdefs.h
 
-		{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-
-		{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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.$ac_ext
 
 
-	{ echo "$as_me:$LINENO: checking for kqueue" >&5
-echo $ECHO_N "checking for kqueue... $ECHO_C" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kqueue" >&5
+$as_echo_n "checking for kqueue... " >&6; }
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 		#include <sys/types.h>
@@ -13330,53 +12267,27 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_KQUEUE 1
-_ACEOF
+$as_echo "#define HAVE_KQUEUE 1" >>confdefs.h
 
-		{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-
-		{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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.$ac_ext
 
 
-	{ echo "$as_me:$LINENO: checking for port framework" >&5
-echo $ECHO_N "checking for port framework... $ECHO_C" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for port framework" >&5
+$as_echo_n "checking for port framework... " >&6; }
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 		#include <port.h>
@@ -13396,53 +12307,27 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PORT 1
-_ACEOF
+$as_echo "#define HAVE_PORT 1" >>confdefs.h
 
-		{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-
-		{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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.$ac_ext
 
 
-	{ echo "$as_me:$LINENO: checking for /dev/poll" >&5
-echo $ECHO_N "checking for /dev/poll... $ECHO_C" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/poll" >&5
+$as_echo_n "checking for /dev/poll... " >&6; }
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 		#include <stdio.h>
@@ -13464,53 +12349,27 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DEVPOLL 1
-_ACEOF
+$as_echo "#define HAVE_DEVPOLL 1" >>confdefs.h
 
-		{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
-		{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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.$ac_ext
 
 
-	{ echo "$as_me:$LINENO: checking for epoll" >&5
-echo $ECHO_N "checking for epoll... $ECHO_C" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for epoll" >&5
+$as_echo_n "checking for epoll... " >&6; }
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 		#include <sys/epoll.h>
@@ -13543,53 +12402,27 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_EPOLL 1
-_ACEOF
+$as_echo "#define HAVE_EPOLL 1" >>confdefs.h
 
-		{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
-		{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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.$ac_ext
 
 
-	{ echo "$as_me:$LINENO: checking for poll" >&5
-echo $ECHO_N "checking for poll... $ECHO_C" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for poll" >&5
+$as_echo_n "checking for poll... " >&6; }
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 		#include <poll.h>
@@ -13612,53 +12445,27 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_POLL 1
-_ACEOF
+$as_echo "#define HAVE_POLL 1" >>confdefs.h
 
-		{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
-		{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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.$ac_ext
 
 
-	{ echo "$as_me:$LINENO: checking for select" >&5
-echo $ECHO_N "checking for select... $ECHO_C" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for select" >&5
+$as_echo_n "checking for select... " >&6; }
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 		/* According to POSIX.1-2001 */
@@ -13686,42 +12493,20 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SELECT 1
-_ACEOF
+$as_echo "#define HAVE_SELECT 1" >>confdefs.h
 
-		{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
-		{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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.$ac_ext
 
 
@@ -13731,7 +12516,7 @@ php_with_fpm_user=nobody
 
 
 # Check whether --with-fpm-user was given.
-if test "${with_fpm_user+set}" = set; then
+if test "${with_fpm_user+set}" = set; then :
   withval=$with_fpm_user; PHP_FPM_USER=$withval
 else
 
@@ -13753,7 +12538,7 @@ php_with_fpm_group=nobody
 
 
 # Check whether --with-fpm-group was given.
-if test "${with_fpm_group+set}" = set; then
+if test "${with_fpm_group+set}" = set; then :
   withval=$with_fpm_group; PHP_FPM_GROUP=$withval
 else
 
@@ -13769,6 +12554,117 @@ ext_output=$PHP_FPM_GROUP
 
 
 
+
+php_with_fpm_systemd=no
+
+
+
+# Check whether --with-fpm-systemd was given.
+if test "${with_fpm_systemd+set}" = set; then :
+  withval=$with_fpm_systemd; PHP_FPM_SYSTEMD=$withval
+else
+
+  PHP_FPM_SYSTEMD=no
+
+
+fi
+
+
+ext_output=$PHP_FPM_SYSTEMD
+
+
+
+
+
+  if test "$PHP_FPM_SYSTEMD" != "no" ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sd_notify in -lsystemd-daemon" >&5
+$as_echo_n "checking for sd_notify in -lsystemd-daemon... " >&6; }
+if test "${ac_cv_lib_systemd_daemon_sd_notify+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsystemd-daemon  $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 sd_notify ();
+int
+main ()
+{
+return sd_notify ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_systemd_daemon_sd_notify=yes
+else
+  ac_cv_lib_systemd_daemon_sd_notify=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_systemd_daemon_sd_notify" >&5
+$as_echo "$ac_cv_lib_systemd_daemon_sd_notify" >&6; }
+if test "x$ac_cv_lib_systemd_daemon_sd_notify" = x""yes; then :
+  SYSTEMD_LIBS="-lsystemd-daemon"
+fi
+
+    for ac_header in systemd/sd-daemon.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "systemd/sd-daemon.h" "ac_cv_header_systemd_sd_daemon_h" "$ac_includes_default"
+if test "x$ac_cv_header_systemd_sd_daemon_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYSTEMD_SD_DAEMON_H 1
+_ACEOF
+ HAVE_SD_DAEMON_H="yes"
+else
+  HAVE_SD_DAEMON_H="no"
+fi
+
+done
+
+    if test $HAVE_SD_DAEMON_H = "no" || test -z "${SYSTEMD_LIBS}"; then
+      as_fn_error "Your system does not support systemd." "$LINENO" 5
+    else
+
+$as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h
+
+      PHP_FPM_SD_FILES="fpm/fpm_systemd.c"
+
+
+  case systemd-daemon in
+  c|c_r|pthread*) ;;
+  *)
+      LIBS="-lsystemd-daemon $LIBS"
+   ;;
+  esac
+
+
+      php_fpm_systemd=notify
+    fi
+  else
+    php_fpm_systemd=simple
+  fi
+
+
+  PHP_VAR_SUBST="$PHP_VAR_SUBST php_fpm_systemd"
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define PHP_FPM_SYSTEMD "$php_fpm_systemd"
+_ACEOF
+
+
   if test -z "$PHP_FPM_USER" -o "$PHP_FPM_USER" = "yes" -o "$PHP_FPM_USER" = "no"; then
     php_fpm_user="nobody"
   else
@@ -13901,23 +12797,14 @@ _ACEOF
   if test "program" = "program"; then
     PHP_BINARIES="$PHP_BINARIES fpm"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=fpm
   fi
@@ -13977,7 +12864,7 @@ echo "$as_me: error:
 
 
   old_IFS=$IFS
-  for ac_src in $PHP_FPM_FILES $PHP_FPM_TRACE_FILES; do
+  for ac_src in $PHP_FPM_FILES $PHP_FPM_TRACE_FILES $PHP_FPM_SD_FILES; do
 
       IFS=.
       set $ac_src
@@ -14022,19 +12909,19 @@ EOF
 
 
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 
 php_with_isapi=no
 
-{ echo "$as_me:$LINENO: checking for Zeus ISAPI support" >&5
-echo $ECHO_N "checking for Zeus ISAPI support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Zeus ISAPI support" >&5
+$as_echo_n "checking for Zeus ISAPI support... " >&6; }
 
 # Check whether --with-isapi was given.
-if test "${with_isapi+set}" = set; then
+if test "${with_isapi+set}" = set; then :
   withval=$with_isapi; PHP_ISAPI=$withval
 else
 
@@ -14045,8 +12932,8 @@ fi
 
 
 ext_output=$PHP_ISAPI
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -14057,21 +12944,15 @@ if test "$PHP_ISAPI" != "no"; then
   else
     ZEUSPATH=$PHP_ISAPI
   fi
-  test -f "$ZEUSPATH/web/include/httpext.h" || { { echo "$as_me:$LINENO: error: Unable to find httpext.h in $ZEUSPATH/web/include" >&5
-echo "$as_me: error: Unable to find httpext.h in $ZEUSPATH/web/include" >&2;}
-   { (exit 1); exit 1; }; }
+  test -f "$ZEUSPATH/web/include/httpext.h" || as_fn_error "Unable to find httpext.h in $ZEUSPATH/web/include" "$LINENO" 5
 
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define WITH_ZEUS 1
-_ACEOF
+$as_echo "#define WITH_ZEUS 1" >>confdefs.h
 
 
   if test "$ZEUSPATH/web/include" != "/usr/include"; then
@@ -14080,10 +12961,10 @@ _ACEOF
     ai_p=$ZEUSPATH/web/include
   else
 
-    ep_dir="`echo $ZEUSPATH/web/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ZEUSPATH/web/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ZEUSPATH/web/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ZEUSPATH/web/include"`
   fi
 
 
@@ -14108,23 +12989,14 @@ _ACEOF
   if test "shared" = "program"; then
     PHP_BINARIES="$PHP_BINARIES isapi"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=isapi
   fi
@@ -14277,8 +13149,8 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking for LiteSpeed support" >&5
-echo $ECHO_N "checking for LiteSpeed support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LiteSpeed support" >&5
+$as_echo_n "checking for LiteSpeed support... " >&6; }
 
 
 php_with_litespeed=no
@@ -14286,7 +13158,7 @@ php_with_litespeed=no
 
 
 # Check whether --with-litespeed was given.
-if test "${with_litespeed+set}" = set; then
+if test "${with_litespeed+set}" = set; then :
   withval=$with_litespeed; PHP_LITESPEED=$withval
 else
 
@@ -14335,23 +13207,14 @@ if test "$PHP_LITESPEED" != "no"; then
   if test "program" = "program"; then
     PHP_BINARIES="$PHP_BINARIES litespeed"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=litespeed
   fi
@@ -14456,18 +13319,18 @@ EOF
 
 fi
 
-{ echo "$as_me:$LINENO: result: $PHP_LITESPEED" >&5
-echo "${ECHO_T}$PHP_LITESPEED" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_LITESPEED" >&5
+$as_echo "$PHP_LITESPEED" >&6; }
 
 
 
 php_with_milter=no
 
-{ echo "$as_me:$LINENO: checking for Milter support" >&5
-echo $ECHO_N "checking for Milter support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Milter support" >&5
+$as_echo_n "checking for Milter support... " >&6; }
 
 # Check whether --with-milter was given.
-if test "${with_milter+set}" = set; then
+if test "${with_milter+set}" = set; then :
   withval=$with_milter; PHP_MILTER=$withval
 else
 
@@ -14478,8 +13341,8 @@ fi
 
 
 ext_output=$PHP_MILTER
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -14492,9 +13355,7 @@ if test "$PHP_MILTER" != "no"; then
       if test -f /usr/lib/libmilter/libmilter.a ; then
         MILTERPATH=/usr/lib/libmilter
       else
-        { { echo "$as_me:$LINENO: error: Unable to find libmilter.a" >&5
-echo "$as_me: error: Unable to find libmilter.a" >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error "Unable to find libmilter.a" "$LINENO" 5
       fi
     fi
   else
@@ -14505,9 +13366,7 @@ echo "$as_me: error: Unable to find libmilter.a" >&2;}
 
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
   fi
 
 
@@ -14520,23 +13379,14 @@ echo "$as_me: error: ZTS currently requires working POSIX threads. We were unabl
   if test "program" = "program"; then
     PHP_BINARIES="$PHP_BINARIES milter"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=milter
   fi
@@ -14630,10 +13480,10 @@ EOF
     ai_p=$MILTERPATH
   else
 
-    ep_dir="`echo $MILTERPATH|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $MILTERPATH|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$MILTERPATH\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$MILTERPATH"`
   fi
 
 
@@ -14682,11 +13532,11 @@ fi
 
 php_with_nsapi=no
 
-{ echo "$as_me:$LINENO: checking for NSAPI support" >&5
-echo $ECHO_N "checking for NSAPI support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSAPI support" >&5
+$as_echo_n "checking for NSAPI support... " >&6; }
 
 # Check whether --with-nsapi was given.
-if test "${with_nsapi+set}" = set; then
+if test "${with_nsapi+set}" = set; then :
   withval=$with_nsapi; PHP_NSAPI=$withval
 else
 
@@ -14697,158 +13547,30 @@ fi
 
 
 ext_output=$PHP_NSAPI
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_NSAPI" != "no"; then
   if test ! -d $PHP_NSAPI/bin ; then
-    { { echo "$as_me:$LINENO: error: Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR" >&5
-echo "$as_me: error: Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR" "$LINENO" 5
   fi
-  { echo "$as_me:$LINENO: checking for NSAPI include files" >&5
-echo $ECHO_N "checking for NSAPI include files... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSAPI include files" >&5
+$as_echo_n "checking for NSAPI include files... " >&6; }
   if test -d $PHP_NSAPI/include ; then
     NSAPI_INC_DIR="$PHP_NSAPI/include"
-    { echo "$as_me:$LINENO: result: Netscape 3.x / Sun 7.x style" >&5
-echo "${ECHO_T}Netscape 3.x / Sun 7.x style" >&6; }
-
-for ac_header in $NSAPI_INC_DIR/nsapi.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Netscape 3.x / Sun 7.x style" >&5
+$as_echo "Netscape 3.x / Sun 7.x style" >&6; }
+    for ac_header in $NSAPI_INC_DIR/nsapi.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"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -14859,142 +13581,16 @@ done
   fi
   if test -d $PHP_NSAPI/plugins/include ; then
     NSAPI_INC_DIR="$PHP_NSAPI/plugins/include"
-    { echo "$as_me:$LINENO: result: iPlanet 4.x / Sun 6.x style" >&5
-echo "${ECHO_T}iPlanet 4.x / Sun 6.x style" >&6; }
-
-for ac_header in $NSAPI_INC_DIR/nsapi.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: iPlanet 4.x / Sun 6.x style" >&5
+$as_echo "iPlanet 4.x / Sun 6.x style" >&6; }
+    for ac_header in $NSAPI_INC_DIR/nsapi.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"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -15004,9 +13600,7 @@ done
     NSAPI_INCLUDE="$NSAPI_INCLUDE -I$NSAPI_INC_DIR"
   fi
   if test -z "$NSAPI_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: Please check you have nsapi.h in either $PHP_NSAPI/include or $PHP_NSAPI/plugins/include" >&5
-echo "$as_me: error: Please check you have nsapi.h in either $PHP_NSAPI/include or $PHP_NSAPI/plugins/include" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Please check you have nsapi.h in either $PHP_NSAPI/include or $PHP_NSAPI/plugins/include" "$LINENO" 5
   fi
 
 
@@ -15021,10 +13615,10 @@ echo "$as_me: error: Please check you have nsapi.h in either $PHP_NSAPI/include
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -15052,37 +13646,24 @@ echo "$as_me: error: Please check you have nsapi.h in either $PHP_NSAPI/include
 
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NSAPI 1
-_ACEOF
+$as_echo "#define HAVE_NSAPI 1" >>confdefs.h
 
 
   if test "shared" = "program"; then
     PHP_BINARIES="$PHP_BINARIES nsapi"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=nsapi
   fi
@@ -15239,11 +13820,11 @@ fi
 
 php_with_phttpd=no
 
-{ echo "$as_me:$LINENO: checking for PHTTPD support" >&5
-echo $ECHO_N "checking for PHTTPD support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PHTTPD support" >&5
+$as_echo_n "checking for PHTTPD support... " >&6; }
 
 # Check whether --with-phttpd was given.
-if test "${with_phttpd+set}" = set; then
+if test "${with_phttpd+set}" = set; then :
   withval=$with_phttpd; PHP_PHTTPD=$withval
 else
 
@@ -15254,24 +13835,20 @@ fi
 
 
 ext_output=$PHP_PHTTPD
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_PHTTPD" != "no"; then
   if test ! -d $PHP_PHTTPD ; then
-    { { echo "$as_me:$LINENO: error: You did not specify a directory" >&5
-echo "$as_me: error: You did not specify a directory" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "You did not specify a directory" "$LINENO" 5
   fi
 
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
   fi
 
 
@@ -15281,10 +13858,10 @@ echo "$as_me: error: ZTS currently requires working POSIX threads. We were unabl
     ai_p=$PHP_PHTTPD/include
   else
 
-    ep_dir="`echo $PHP_PHTTPD/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_PHTTPD/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_PHTTPD/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_PHTTPD/include"`
   fi
 
 
@@ -15306,31 +13883,20 @@ echo "$as_me: error: ZTS currently requires working POSIX threads. We were unabl
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PHTTPD 1
-_ACEOF
+$as_echo "#define HAVE_PHTTPD 1" >>confdefs.h
 
 
   if test "shared" = "program"; then
     PHP_BINARIES="$PHP_BINARIES phttpd"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=phttpd
   fi
@@ -15486,11 +14052,11 @@ fi
 
 php_with_pi3web=no
 
-{ echo "$as_me:$LINENO: checking for Pi3Web support" >&5
-echo $ECHO_N "checking for Pi3Web support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Pi3Web support" >&5
+$as_echo_n "checking for Pi3Web support... " >&6; }
 
 # Check whether --with-pi3web was given.
-if test "${with_pi3web+set}" = set; then
+if test "${with_pi3web+set}" = set; then :
   withval=$with_pi3web; PHP_PI3WEB=$withval
 else
 
@@ -15501,8 +14067,8 @@ fi
 
 
 ext_output=$PHP_PI3WEB
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -15513,21 +14079,15 @@ if test "$PHP_PI3WEB" != "no"; then
   else
     PI3PATH=$PHP_PI3WEB
   fi
-  test -f "$PI3PATH/PiAPI/PiAPI.h" || { { echo "$as_me:$LINENO: error: Unable to find PiAPI.h in $PI3PATH/PiAPI" >&5
-echo "$as_me: error: Unable to find PiAPI.h in $PI3PATH/PiAPI" >&2;}
-   { (exit 1); exit 1; }; }
+  test -f "$PI3PATH/PiAPI/PiAPI.h" || as_fn_error "Unable to find PiAPI.h in $PI3PATH/PiAPI" "$LINENO" 5
 
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define WITH_PI3WEB 1
-_ACEOF
+$as_echo "#define WITH_PI3WEB 1" >>confdefs.h
 
 
   if test "$PI3PATH/PiAPI" != "/usr/include"; then
@@ -15536,10 +14096,10 @@ _ACEOF
     ai_p=$PI3PATH/PiAPI
   else
 
-    ep_dir="`echo $PI3PATH/PiAPI|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PI3PATH/PiAPI|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PI3PATH/PiAPI\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PI3PATH/PiAPI"`
   fi
 
 
@@ -15567,10 +14127,10 @@ _ACEOF
     ai_p=$PI3PATH/Pi2API
   else
 
-    ep_dir="`echo $PI3PATH/Pi2API|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PI3PATH/Pi2API|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PI3PATH/Pi2API\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PI3PATH/Pi2API"`
   fi
 
 
@@ -15598,10 +14158,10 @@ _ACEOF
     ai_p=$PI3PATH/Pi3API
   else
 
-    ep_dir="`echo $PI3PATH/Pi3API|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PI3PATH/Pi3API|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PI3PATH/Pi3API\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PI3PATH/Pi3API"`
   fi
 
 
@@ -15629,10 +14189,10 @@ _ACEOF
     ai_p=$PI3PATH/PHP5
   else
 
-    ep_dir="`echo $PI3PATH/PHP5|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PI3PATH/PHP5|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PI3PATH/PHP5\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PI3PATH/PHP5"`
   fi
 
 
@@ -15657,23 +14217,14 @@ _ACEOF
   if test "shared" = "program"; then
     PHP_BINARIES="$PHP_BINARIES pi3web"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=pi3web
   fi
@@ -15832,7 +14383,7 @@ php_with_roxen=no
 
 
 # Check whether --with-roxen was given.
-if test "${with_roxen+set}" = set; then
+if test "${with_roxen+set}" = set; then :
   withval=$with_roxen; PHP_ROXEN=$withval
 else
 
@@ -15851,10 +14402,10 @@ ext_output=$PHP_ROXEN
 
 php_enable_roxen_zts=no
 
-{ echo "$as_me:$LINENO: checking whether Roxen module is build using ZTS" >&5
-echo $ECHO_N "checking whether Roxen module is build using ZTS... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Roxen module is build using ZTS" >&5
+$as_echo_n "checking whether Roxen module is build using ZTS... " >&6; }
 # Check whether --enable-roxen-zts was given.
-if test "${enable_roxen_zts+set}" = set; then
+if test "${enable_roxen_zts+set}" = set; then :
   enableval=$enable_roxen_zts; PHP_ROXEN_ZTS=$enableval
 else
 
@@ -15865,43 +14416,35 @@ fi
 
 
 ext_output=$PHP_ROXEN_ZTS
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 RESULT=
-{ echo "$as_me:$LINENO: checking for Roxen/Pike support" >&5
-echo $ECHO_N "checking for Roxen/Pike support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Roxen/Pike support" >&5
+$as_echo_n "checking for Roxen/Pike support... " >&6; }
 if test "$PHP_ROXEN" != "no"; then
   if test ! -d $PHP_ROXEN ; then
-    { { echo "$as_me:$LINENO: error: You did not specify a directory" >&5
-echo "$as_me: error: You did not specify a directory" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "You did not specify a directory" "$LINENO" 5
   fi
   if test -f $PHP_ROXEN/bin/roxen; then
     PIKE=$PHP_ROXEN/bin/roxen
   elif test -f $PHP_ROXEN/bin/pike; then
     PIKE=$PHP_ROXEN/bin/pike
   else
-    { { echo "$as_me:$LINENO: error: Could not find a pike in $PHP_ROXEN/bin/" >&5
-echo "$as_me: error: Could not find a pike in $PHP_ROXEN/bin/" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Could not find a pike in $PHP_ROXEN/bin/" "$LINENO" 5
   fi
 
   if $PIKE -e 'float v; catch(v = __VERSION__ + (__BUILD__/10000.0)); if(v < 0.7079) exit(1); exit(0);'; then
     PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Module' | sed -e 's/.*: //'`
     PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,'`
     if test -z "$PIKE_INCLUDE_DIR" || test -z "$PIKE_MODULE_DIR"; then
-      { { echo "$as_me:$LINENO: error: Failed to figure out Pike module and include directories" >&5
-echo "$as_me: error: Failed to figure out Pike module and include directories" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Failed to figure out Pike module and include directories" "$LINENO" 5
     fi
   else
-    { { echo "$as_me:$LINENO: error: Roxen/PHP requires Pike 0.7.79 or newer" >&5
-echo "$as_me: error: Roxen/PHP requires Pike 0.7.79 or newer" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Roxen/PHP requires Pike 0.7.79 or newer" "$LINENO" 5
   fi
 
 
@@ -15911,10 +14454,10 @@ echo "$as_me: error: Roxen/PHP requires Pike 0.7.79 or newer" >&2;}
     ai_p=$PIKE_INCLUDE_DIR
   else
 
-    ep_dir="`echo $PIKE_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PIKE_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PIKE_INCLUDE_DIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PIKE_INCLUDE_DIR"`
   fi
 
 
@@ -15936,31 +14479,20 @@ echo "$as_me: error: Roxen/PHP requires Pike 0.7.79 or newer" >&2;}
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ROXEN 1
-_ACEOF
+$as_echo "#define HAVE_ROXEN 1" >>confdefs.h
 
 
   if test "shared" = "program"; then
     PHP_BINARIES="$PHP_BINARIES roxen"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=roxen
   fi
@@ -16119,20 +14651,16 @@ EOF
 
   enable_maintainer_zts=yes
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&5
-echo "$as_me: error: ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define ROXEN_USE_ZTS 1
-_ACEOF
+$as_echo "#define ROXEN_USE_ZTS 1" >>confdefs.h
 
   fi
 fi
-{ echo "$as_me:$LINENO: result: $RESULT" >&5
-echo "${ECHO_T}$RESULT" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $RESULT" >&5
+$as_echo "$RESULT" >&6; }
 
 
 
@@ -16142,7 +14670,7 @@ php_with_thttpd=no
 
 
 # Check whether --with-thttpd was given.
-if test "${with_thttpd+set}" = set; then
+if test "${with_thttpd+set}" = set; then :
   withval=$with_thttpd; PHP_THTTPD=$withval
 else
 
@@ -16158,13 +14686,13 @@ ext_output=$PHP_THTTPD
 
 
 
-{ echo "$as_me:$LINENO: checking for thttpd" >&5
-echo $ECHO_N "checking for thttpd... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for thttpd" >&5
+$as_echo_n "checking for thttpd... " >&6; }
 
 if test "$PHP_THTTPD" != "no"; then
   if test ! -d $PHP_THTTPD; then
-    { echo "$as_me:$LINENO: result: thttpd directory does not exist ($PHP_THTTPD)" >&5
-echo "${ECHO_T}thttpd directory does not exist ($PHP_THTTPD)" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: thttpd directory does not exist ($PHP_THTTPD)" >&5
+$as_echo "thttpd directory does not exist ($PHP_THTTPD)" >&6; }
   fi
 
 
@@ -16172,10 +14700,10 @@ echo "${ECHO_T}thttpd directory does not exist ($PHP_THTTPD)" >&6; }
     THTTPD=$PHP_THTTPD
   else
 
-    ep_dir="`echo $PHP_THTTPD|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_THTTPD|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    THTTPD="$ep_realdir/`basename \"$PHP_THTTPD\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    THTTPD="$ep_realdir"/`basename "$PHP_THTTPD"`
   fi
 
 
@@ -16186,18 +14714,16 @@ echo "${ECHO_T}thttpd directory does not exist ($PHP_THTTPD)" >&6; }
   elif grep Premium $PHP_THTTPD/version.h >/dev/null; then
     patch=
   else
-    { { echo "$as_me:$LINENO: error: This version only supports thttpd-2.21b and Premium thttpd" >&5
-echo "$as_me: error: This version only supports thttpd-2.21b and Premium thttpd" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "This version only supports thttpd-2.21b and Premium thttpd" "$LINENO" 5
   fi
 
   if test -n "$GCC"; then
 
   gcc_arg_name=ac_cv_gcc_arg_rdynamic
-  { echo "$as_me:$LINENO: checking whether $CC supports -rdynamic" >&5
-echo $ECHO_N "checking whether $CC supports -rdynamic... $ECHO_C" >&6; }
-if test "${ac_cv_gcc_arg_rdynamic+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -rdynamic" >&5
+$as_echo_n "checking whether $CC supports -rdynamic... " >&6; }
+if test "${ac_cv_gcc_arg_rdynamic+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
   echo 'void somefunc() { };' > conftest.c
@@ -16211,8 +14737,8 @@ else
   rm -f conftest.*
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_gcc_arg_rdynamic" >&5
-echo "${ECHO_T}$ac_cv_gcc_arg_rdynamic" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gcc_arg_rdynamic" >&5
+$as_echo "$ac_cv_gcc_arg_rdynamic" >&6; }
   if eval test "\$$gcc_arg_name" = "yes"; then
     gcc_rdynamic=yes
   else
@@ -16241,10 +14767,10 @@ echo "${ECHO_T}$ac_cv_gcc_arg_rdynamic" >&6; }
     ai_p=$THTTPD
   else
 
-    ep_dir="`echo $THTTPD|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THTTPD|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THTTPD\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THTTPD"`
   fi
 
 
@@ -16269,23 +14795,14 @@ echo "${ECHO_T}$ac_cv_gcc_arg_rdynamic" >&6; }
   if test "static" = "program"; then
     PHP_BINARIES="$PHP_BINARIES thttpd"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=thttpd
   fi
@@ -16392,8 +14909,8 @@ echo "$as_me: error:
 
 
 fi
-{ echo "$as_me:$LINENO: result: $PHP_THTTPD" >&5
-echo "${ECHO_T}$PHP_THTTPD" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_THTTPD" >&5
+$as_echo "$PHP_THTTPD" >&6; }
 
 
 
@@ -16402,7 +14919,7 @@ php_with_tux=no
 
 
 # Check whether --with-tux was given.
-if test "${with_tux+set}" = set; then
+if test "${with_tux+set}" = set; then :
   withval=$with_tux; PHP_TUX=$withval
 else
 
@@ -16418,150 +14935,20 @@ ext_output=$PHP_TUX
 
 
 
-{ echo "$as_me:$LINENO: checking for TUX" >&5
-echo $ECHO_N "checking for TUX... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TUX" >&5
+$as_echo_n "checking for TUX... " >&6; }
 if test "$PHP_TUX" != "no"; then
   INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_TUX/php5.tux.so"
-
-for ac_header in tuxmodule.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  for ac_header in tuxmodule.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "tuxmodule.h" "ac_cv_header_tuxmodule_h" "$ac_includes_default"
+if test "x$ac_cv_header_tuxmodule_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_TUXMODULE_H 1
 _ACEOF
  :
 else
-  { { echo "$as_me:$LINENO: error: Cannot find tuxmodule.h" >&5
-echo "$as_me: error: Cannot find tuxmodule.h" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "Cannot find tuxmodule.h" "$LINENO" 5
 fi
 
 done
@@ -16570,23 +14957,14 @@ done
   if test "shared" = "program"; then
     PHP_BINARIES="$PHP_BINARIES tux"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=tux
   fi
@@ -16734,11 +15112,11 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: result: $PHP_TUX" >&5
-echo "${ECHO_T}$PHP_TUX" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_TUX" >&5
+$as_echo "$PHP_TUX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -16748,7 +15126,7 @@ php_with_webjames=no
 
 
 # Check whether --with-webjames was given.
-if test "${with_webjames+set}" = set; then
+if test "${with_webjames+set}" = set; then :
   withval=$with_webjames; PHP_WEBJAMES=$withval
 else
 
@@ -16764,8 +15142,8 @@ ext_output=$PHP_WEBJAMES
 
 
 
-{ echo "$as_me:$LINENO: checking for webjames" >&5
-echo $ECHO_N "checking for webjames... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for webjames" >&5
+$as_echo_n "checking for webjames... " >&6; }
 
 if test "$PHP_WEBJAMES" != "no"; then
 
@@ -16773,10 +15151,10 @@ if test "$PHP_WEBJAMES" != "no"; then
     PHP_WEBJAMES=$PHP_WEBJAMES
   else
 
-    ep_dir="`echo $PHP_WEBJAMES|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_WEBJAMES|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    PHP_WEBJAMES="$ep_realdir/`basename \"$PHP_WEBJAMES\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    PHP_WEBJAMES="$ep_realdir"/`basename "$PHP_WEBJAMES"`
   fi
 
   INSTALL_IT="\
@@ -16790,10 +15168,10 @@ if test "$PHP_WEBJAMES" != "no"; then
     ai_p=$PHP_WEBJAMES
   else
 
-    ep_dir="`echo $PHP_WEBJAMES|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_WEBJAMES|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_WEBJAMES\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_WEBJAMES"`
   fi
 
 
@@ -16818,23 +15196,14 @@ if test "$PHP_WEBJAMES" != "no"; then
   if test "static" = "program"; then
     PHP_BINARIES="$PHP_BINARIES webjames"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=webjames
   fi
@@ -16982,11 +15351,11 @@ EOF
 
 
 
-  { echo "$as_me:$LINENO: result: yes, using $PHP_WEBJAMES" >&5
-echo "${ECHO_T}yes, using $PHP_WEBJAMES" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, using $PHP_WEBJAMES" >&5
+$as_echo "yes, using $PHP_WEBJAMES" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -16995,7 +15364,7 @@ php_enable_cgi=yes
 
 
 # Check whether --enable-cgi was given.
-if test "${enable_cgi+set}" = set; then
+if test "${enable_cgi+set}" = set; then :
   enableval=$enable_cgi; PHP_CGI=$enableval
 else
 
@@ -17011,80 +15380,66 @@ ext_output=$PHP_CGI
 
 
 
-{ echo "$as_me:$LINENO: checking for CGI build" >&5
-echo $ECHO_N "checking for CGI build... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CGI build" >&5
+$as_echo_n "checking for CGI build... " >&6; }
 if test "$PHP_CGI" != "no"; then
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-    { echo "$as_me:$LINENO: checking for socklen_t in sys/socket.h" >&5
-echo $ECHO_N "checking for socklen_t in sys/socket.h... $ECHO_C" >&6; }
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t in sys/socket.h" >&5
+$as_echo_n "checking for socklen_t in sys/socket.h... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/socket.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "socklen_t" >/dev/null 2>&1; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  $EGREP "socklen_t" >/dev/null 2>&1; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SOCKLEN_T 1
-_ACEOF
+$as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h
 
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 
-    { echo "$as_me:$LINENO: checking for sun_len in sys/un.h" >&5
-echo $ECHO_N "checking for sun_len in sys/un.h... $ECHO_C" >&6; }
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sun_len in sys/un.h" >&5
+$as_echo_n "checking for sun_len in sys/un.h... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/un.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "sun_len" >/dev/null 2>&1; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  $EGREP "sun_len" >/dev/null 2>&1; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SOCKADDR_UN_SUN_LEN 1
-_ACEOF
+$as_echo "#define HAVE_SOCKADDR_UN_SUN_LEN 1" >>confdefs.h
 
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 
-    { echo "$as_me:$LINENO: checking whether cross-process locking is required by accept()" >&5
-echo $ECHO_N "checking whether cross-process locking is required by accept()... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cross-process locking is required by accept()" >&5
+$as_echo_n "checking whether cross-process locking is required by accept()... " >&6; }
     case "`uname -sr`" in
       IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0)
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_LOCKING 1
-_ACEOF
+$as_echo "#define USE_LOCKING 1" >>confdefs.h
 
       ;;
       *)
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       ;;
     esac
 
@@ -17108,23 +15463,14 @@ echo "${ECHO_T}no" >&6; }
   if test "program" = "program"; then
     PHP_BINARIES="$PHP_BINARIES cgi"
   elif test "$PHP_SAPI" != "none"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 +--------------------------------------------------------------------+
 |                        *** ATTENTION ***                           |
 |                                                                    |
 | You've configured multiple SAPIs to be build. You can build only   |
 | one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
 +--------------------------------------------------------------------+
-" >&5
-echo "$as_me: error:
-+--------------------------------------------------------------------+
-|                        *** ATTENTION ***                           |
-|                                                                    |
-| You've configured multiple SAPIs to be build. You can build only   |
-| one SAPI module plus CGI, CLI and FPM binaries at the same time.   |
-+--------------------------------------------------------------------+
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
     PHP_SAPI=cgi
   fi
@@ -17231,32 +15577,34 @@ EOF
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST BUILD_CGI"
 
+
+
+  PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES sapi/cgi/php-cgi.1"
+
 else
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
 
-{ echo "$as_me:$LINENO: checking for chosen SAPI module" >&5
-echo $ECHO_N "checking for chosen SAPI module... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $PHP_SAPI" >&5
-echo "${ECHO_T}$PHP_SAPI" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for chosen SAPI module" >&5
+$as_echo_n "checking for chosen SAPI module... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_SAPI" >&5
+$as_echo "$PHP_SAPI" >&6; }
 
-{ echo "$as_me:$LINENO: checking for executable SAPI binaries" >&5
-echo $ECHO_N "checking for executable SAPI binaries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for executable SAPI binaries" >&5
+$as_echo_n "checking for executable SAPI binaries... " >&6; }
 if test "$PHP_BINARIES"; then
-  { echo "$as_me:$LINENO: result: $PHP_BINARIES" >&5
-echo "${ECHO_T}$PHP_BINARIES" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_BINARIES" >&5
+$as_echo "$PHP_BINARIES" >&6; }
 else
-  { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
 fi
 
 if test -z "$PHP_INSTALLED_SAPIS"; then
-  { { echo "$as_me:$LINENO: error: Nothing to build." >&5
-echo "$as_me: error: Nothing to build." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "Nothing to build." "$LINENO" 5
 fi
 
 if test "$enable_maintainer_zts" = "yes"; then
@@ -17274,9 +15622,7 @@ fi
     host_alias=$host
   fi
   if test -z "$host_alias"; then
-    { { echo "$as_me:$LINENO: error: host_alias is not set. Make sure to run config.guess" >&5
-echo "$as_me: error: host_alias is not set. Make sure to run config.guess" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "host_alias is not set. Make sure to run config.guess" "$LINENO" 5
   fi
   case $host_alias in
   *solaris*)
@@ -17303,20 +15649,20 @@ fi
 
 
 
-  { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-  { echo "$as_me:$LINENO: result: ${T_MD}Running system checks${T_ME}" >&5
-echo "${ECHO_T}${T_MD}Running system checks${T_ME}" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Running system checks${T_ME}" >&5
+$as_echo "${T_MD}Running system checks${T_ME}" >&6; }
 
 
 
   PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib
   # Extract the first word of "sendmail", so it can be a program name with args.
 set dummy sendmail; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_PROG_SENDMAIL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PROG_SENDMAIL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $PROG_SENDMAIL in
   [\\/]* | ?:[\\/]*)
@@ -17329,14 +15675,14 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PROG_SENDMAIL="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -17344,11 +15690,11 @@ esac
 fi
 PROG_SENDMAIL=$ac_cv_path_PROG_SENDMAIL
 if test -n "$PROG_SENDMAIL"; then
-  { echo "$as_me:$LINENO: result: $PROG_SENDMAIL" >&5
-echo "${ECHO_T}$PROG_SENDMAIL" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROG_SENDMAIL" >&5
+$as_echo "$PROG_SENDMAIL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -17358,22 +15704,18 @@ fi
 
 
 
-  { echo "$as_me:$LINENO: checking whether system uses EBCDIC" >&5
-echo $ECHO_N "checking whether system uses EBCDIC... $ECHO_C" >&6; }
-if test "${ac_cv_ebcdic+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system uses EBCDIC" >&5
+$as_echo_n "checking whether system uses EBCDIC... " >&6; }
+if test "${ac_cv_ebcdic+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
   ac_cv_ebcdic=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int main(void) {
@@ -17381,70 +15723,40 @@ int main(void) {
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_ebcdic=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
   ac_cv_ebcdic=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_ebcdic" >&5
-echo "${ECHO_T}$ac_cv_ebcdic" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ebcdic" >&5
+$as_echo "$ac_cv_ebcdic" >&6; }
   if test "$ac_cv_ebcdic" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define CHARSET_EBCDIC 1
-_ACEOF
+$as_echo "#define CHARSET_EBCDIC 1" >>confdefs.h
 
   fi
 
 
-{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
-if test "${ac_cv_c_bigendian_php+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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 test "${ac_cv_c_bigendian_php+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
   ac_cv_c_bigendian_php=unknown
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_c_bigendian_php=unknown
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int main(void)
@@ -17460,69 +15772,39 @@ int main(void)
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_bigendian_php=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_bigendian_php=no
+  ac_cv_c_bigendian_php=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian_php" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian_php" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian_php" >&5
+$as_echo "$ac_cv_c_bigendian_php" >&6; }
  if test $ac_cv_c_bigendian_php = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN
-_ACEOF
+$as_echo "#define WORDS_BIGENDIAN /**/" >>confdefs.h
 
  fi
 
 
 
-  { echo "$as_me:$LINENO: checking whether writing to stdout works" >&5
-echo $ECHO_N "checking whether writing to stdout works... $ECHO_C" >&6; }
-if test "${ac_cv_write_stdout+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether writing to stdout works" >&5
+$as_echo_n "checking whether writing to stdout works... " >&6; }
+if test "${ac_cv_write_stdout+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
 
       ac_cv_write_stdout=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HAVE_UNISTD_H
@@ -17540,52 +15822,26 @@ main()
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
       ac_cv_write_stdout=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
       ac_cv_write_stdout=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_write_stdout" >&5
-echo "${ECHO_T}$ac_cv_write_stdout" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_write_stdout" >&5
+$as_echo "$ac_cv_write_stdout" >&6; }
   if test "$ac_cv_write_stdout" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define PHP_WRITE_STDOUT 1
-_ACEOF
+$as_echo "#define PHP_WRITE_STDOUT 1" >>confdefs.h
 
   fi
 
@@ -17601,10 +15857,10 @@ test -d /usr/ucblib &&
     ai_p=/usr/ucblib
   else
 
-    ep_dir="`echo /usr/ucblib|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo /usr/ucblib|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"/usr/ucblib\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "/usr/ucblib"`
   fi
 
 
@@ -17636,172 +15892,12 @@ test -d /usr/ucblib &&
   unset ac_cv_func___socket
   unset found
 
-  { echo "$as_me:$LINENO: checking for socket" >&5
-echo $ECHO_N "checking for socket... $ECHO_C" >&6; }
-if test "${ac_cv_func_socket+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define socket to an innocuous variant, in case <limits.h> declares socket.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define socket innocuous_socket
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char socket (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef socket
-
-/* 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 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_socket || defined __stub___socket
-choke me
-#endif
-
-int
-main ()
-{
-return socket ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_socket=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_socket=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5
-echo "${ECHO_T}$ac_cv_func_socket" >&6; }
-if test $ac_cv_func_socket = yes; then
+  ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
+if test "x$ac_cv_func_socket" = x""yes; then :
   found=yes
 else
-   { echo "$as_me:$LINENO: checking for __socket" >&5
-echo $ECHO_N "checking for __socket... $ECHO_C" >&6; }
-if test "${ac_cv_func___socket+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __socket to an innocuous variant, in case <limits.h> declares __socket.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __socket innocuous___socket
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __socket (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __socket
-
-/* 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 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub___socket || defined __stub_____socket
-choke me
-#endif
-
-int
-main ()
-{
-return __socket ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func___socket=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func___socket=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func___socket" >&5
-echo "${ECHO_T}$ac_cv_func___socket" >&6; }
-if test $ac_cv_func___socket = yes; then
+   ac_fn_c_check_func "$LINENO" "__socket" "ac_cv_func___socket"
+if test "x$ac_cv_func___socket" = x""yes; then :
   found=yes
 else
   found=no
@@ -17813,9 +15909,7 @@ fi
   case $found in
   yes)
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SOCKET 1
-_ACEOF
+$as_echo "#define HAVE_SOCKET 1" >>confdefs.h
 
     ac_cv_func_socket=yes
   ;;
@@ -17825,18 +15919,14 @@ _ACEOF
   unset ac_cv_lib_socket_socket
   unset ac_cv_lib_socket___socket
   unset found
-  { echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
-echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6; }
-if test "${ac_cv_lib_socket_socket+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
+$as_echo_n "checking for socket in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_socket+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -17854,54 +15944,29 @@ return socket ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_socket=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket_socket=no
+  ac_cv_lib_socket_socket=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6; }
-if test $ac_cv_lib_socket_socket = yes; 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" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __socket in -lsocket" >&5
-echo $ECHO_N "checking for __socket in -lsocket... $ECHO_C" >&6; }
-if test "${ac_cv_lib_socket___socket+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __socket in -lsocket" >&5
+$as_echo_n "checking for __socket in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket___socket+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -17919,39 +15984,18 @@ return __socket ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___socket=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket___socket=no
+  ac_cv_lib_socket___socket=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket___socket" >&5
-echo "${ECHO_T}$ac_cv_lib_socket___socket" >&6; }
-if test $ac_cv_lib_socket___socket = yes; 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" = x""yes; then :
   found=yes
 else
   found=no
@@ -17964,50 +16008,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -18023,14 +16039,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SOCKET 1
-_ACEOF
+$as_echo "#define HAVE_SOCKET 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBSOCKET 1
-_ACEOF
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_socket=yes
   else
@@ -18048,172 +16060,12 @@ _ACEOF
   unset ac_cv_func___socketpair
   unset found
 
-  { echo "$as_me:$LINENO: checking for socketpair" >&5
-echo $ECHO_N "checking for socketpair... $ECHO_C" >&6; }
-if test "${ac_cv_func_socketpair+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define socketpair to an innocuous variant, in case <limits.h> declares socketpair.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define socketpair innocuous_socketpair
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char socketpair (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef socketpair
-
-/* 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 socketpair ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_socketpair || defined __stub___socketpair
-choke me
-#endif
-
-int
-main ()
-{
-return socketpair ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_socketpair=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_socketpair=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_socketpair" >&5
-echo "${ECHO_T}$ac_cv_func_socketpair" >&6; }
-if test $ac_cv_func_socketpair = yes; then
+  ac_fn_c_check_func "$LINENO" "socketpair" "ac_cv_func_socketpair"
+if test "x$ac_cv_func_socketpair" = x""yes; then :
   found=yes
 else
-   { echo "$as_me:$LINENO: checking for __socketpair" >&5
-echo $ECHO_N "checking for __socketpair... $ECHO_C" >&6; }
-if test "${ac_cv_func___socketpair+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __socketpair to an innocuous variant, in case <limits.h> declares __socketpair.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __socketpair innocuous___socketpair
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __socketpair (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __socketpair
-
-/* 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 __socketpair ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub___socketpair || defined __stub_____socketpair
-choke me
-#endif
-
-int
-main ()
-{
-return __socketpair ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func___socketpair=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func___socketpair=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func___socketpair" >&5
-echo "${ECHO_T}$ac_cv_func___socketpair" >&6; }
-if test $ac_cv_func___socketpair = yes; then
+   ac_fn_c_check_func "$LINENO" "__socketpair" "ac_cv_func___socketpair"
+if test "x$ac_cv_func___socketpair" = x""yes; then :
   found=yes
 else
   found=no
@@ -18225,9 +16077,7 @@ fi
   case $found in
   yes)
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SOCKETPAIR 1
-_ACEOF
+$as_echo "#define HAVE_SOCKETPAIR 1" >>confdefs.h
 
     ac_cv_func_socketpair=yes
   ;;
@@ -18237,18 +16087,14 @@ _ACEOF
   unset ac_cv_lib_socket_socketpair
   unset ac_cv_lib_socket___socketpair
   unset found
-  { echo "$as_me:$LINENO: checking for socketpair in -lsocket" >&5
-echo $ECHO_N "checking for socketpair in -lsocket... $ECHO_C" >&6; }
-if test "${ac_cv_lib_socket_socketpair+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socketpair in -lsocket" >&5
+$as_echo_n "checking for socketpair in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_socketpair+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -18266,54 +16112,29 @@ return socketpair ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_socketpair=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket_socketpair=no
+  ac_cv_lib_socket_socketpair=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socketpair" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_socketpair" >&6; }
-if test $ac_cv_lib_socket_socketpair = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socketpair" >&5
+$as_echo "$ac_cv_lib_socket_socketpair" >&6; }
+if test "x$ac_cv_lib_socket_socketpair" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __socketpair in -lsocket" >&5
-echo $ECHO_N "checking for __socketpair in -lsocket... $ECHO_C" >&6; }
-if test "${ac_cv_lib_socket___socketpair+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __socketpair in -lsocket" >&5
+$as_echo_n "checking for __socketpair in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket___socketpair+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -18331,39 +16152,18 @@ return __socketpair ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___socketpair=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket___socketpair=no
+  ac_cv_lib_socket___socketpair=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket___socketpair" >&5
-echo "${ECHO_T}$ac_cv_lib_socket___socketpair" >&6; }
-if test $ac_cv_lib_socket___socketpair = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___socketpair" >&5
+$as_echo "$ac_cv_lib_socket___socketpair" >&6; }
+if test "x$ac_cv_lib_socket___socketpair" = x""yes; then :
   found=yes
 else
   found=no
@@ -18376,50 +16176,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -18435,14 +16207,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SOCKETPAIR 1
-_ACEOF
+$as_echo "#define HAVE_SOCKETPAIR 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBSOCKET 1
-_ACEOF
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_socketpair=yes
   else
@@ -18460,172 +16228,12 @@ _ACEOF
   unset ac_cv_func___htonl
   unset found
 
-  { echo "$as_me:$LINENO: checking for htonl" >&5
-echo $ECHO_N "checking for htonl... $ECHO_C" >&6; }
-if test "${ac_cv_func_htonl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define htonl to an innocuous variant, in case <limits.h> declares htonl.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define htonl innocuous_htonl
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char htonl (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef htonl
-
-/* 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 htonl ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_htonl || defined __stub___htonl
-choke me
-#endif
-
-int
-main ()
-{
-return htonl ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_htonl=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_htonl=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_htonl" >&5
-echo "${ECHO_T}$ac_cv_func_htonl" >&6; }
-if test $ac_cv_func_htonl = yes; then
+  ac_fn_c_check_func "$LINENO" "htonl" "ac_cv_func_htonl"
+if test "x$ac_cv_func_htonl" = x""yes; then :
   found=yes
 else
-   { echo "$as_me:$LINENO: checking for __htonl" >&5
-echo $ECHO_N "checking for __htonl... $ECHO_C" >&6; }
-if test "${ac_cv_func___htonl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __htonl to an innocuous variant, in case <limits.h> declares __htonl.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __htonl innocuous___htonl
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __htonl (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __htonl
-
-/* 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 __htonl ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub___htonl || defined __stub_____htonl
-choke me
-#endif
-
-int
-main ()
-{
-return __htonl ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func___htonl=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func___htonl=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func___htonl" >&5
-echo "${ECHO_T}$ac_cv_func___htonl" >&6; }
-if test $ac_cv_func___htonl = yes; then
+   ac_fn_c_check_func "$LINENO" "__htonl" "ac_cv_func___htonl"
+if test "x$ac_cv_func___htonl" = x""yes; then :
   found=yes
 else
   found=no
@@ -18637,9 +16245,7 @@ fi
   case $found in
   yes)
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_HTONL 1
-_ACEOF
+$as_echo "#define HAVE_HTONL 1" >>confdefs.h
 
     ac_cv_func_htonl=yes
   ;;
@@ -18649,18 +16255,14 @@ _ACEOF
   unset ac_cv_lib_socket_htonl
   unset ac_cv_lib_socket___htonl
   unset found
-  { echo "$as_me:$LINENO: checking for htonl in -lsocket" >&5
-echo $ECHO_N "checking for htonl in -lsocket... $ECHO_C" >&6; }
-if test "${ac_cv_lib_socket_htonl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htonl in -lsocket" >&5
+$as_echo_n "checking for htonl in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_htonl+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -18678,54 +16280,29 @@ return htonl ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_htonl=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket_htonl=no
+  ac_cv_lib_socket_htonl=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_htonl" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_htonl" >&6; }
-if test $ac_cv_lib_socket_htonl = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_htonl" >&5
+$as_echo "$ac_cv_lib_socket_htonl" >&6; }
+if test "x$ac_cv_lib_socket_htonl" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __htonl in -lsocket" >&5
-echo $ECHO_N "checking for __htonl in -lsocket... $ECHO_C" >&6; }
-if test "${ac_cv_lib_socket___htonl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __htonl in -lsocket" >&5
+$as_echo_n "checking for __htonl in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket___htonl+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -18743,39 +16320,18 @@ return __htonl ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___htonl=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket___htonl=no
+  ac_cv_lib_socket___htonl=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket___htonl" >&5
-echo "${ECHO_T}$ac_cv_lib_socket___htonl" >&6; }
-if test $ac_cv_lib_socket___htonl = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___htonl" >&5
+$as_echo "$ac_cv_lib_socket___htonl" >&6; }
+if test "x$ac_cv_lib_socket___htonl" = x""yes; then :
   found=yes
 else
   found=no
@@ -18788,50 +16344,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -18847,14 +16375,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_HTONL 1
-_ACEOF
+$as_echo "#define HAVE_HTONL 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBSOCKET 1
-_ACEOF
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_htonl=yes
   else
@@ -18872,172 +16396,12 @@ _ACEOF
   unset ac_cv_func___gethostname
   unset found
 
-  { echo "$as_me:$LINENO: checking for gethostname" >&5
-echo $ECHO_N "checking for gethostname... $ECHO_C" >&6; }
-if test "${ac_cv_func_gethostname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define gethostname to an innocuous variant, in case <limits.h> declares gethostname.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define gethostname innocuous_gethostname
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostname (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef gethostname
-
-/* 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 gethostname ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_gethostname || defined __stub___gethostname
-choke me
-#endif
-
-int
-main ()
-{
-return gethostname ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_gethostname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_gethostname=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostname" >&5
-echo "${ECHO_T}$ac_cv_func_gethostname" >&6; }
-if test $ac_cv_func_gethostname = yes; then
+  ac_fn_c_check_func "$LINENO" "gethostname" "ac_cv_func_gethostname"
+if test "x$ac_cv_func_gethostname" = x""yes; then :
   found=yes
 else
-   { echo "$as_me:$LINENO: checking for __gethostname" >&5
-echo $ECHO_N "checking for __gethostname... $ECHO_C" >&6; }
-if test "${ac_cv_func___gethostname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __gethostname to an innocuous variant, in case <limits.h> declares __gethostname.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __gethostname innocuous___gethostname
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __gethostname (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __gethostname
-
-/* 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 __gethostname ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub___gethostname || defined __stub_____gethostname
-choke me
-#endif
-
-int
-main ()
-{
-return __gethostname ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func___gethostname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func___gethostname=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func___gethostname" >&5
-echo "${ECHO_T}$ac_cv_func___gethostname" >&6; }
-if test $ac_cv_func___gethostname = yes; then
+   ac_fn_c_check_func "$LINENO" "__gethostname" "ac_cv_func___gethostname"
+if test "x$ac_cv_func___gethostname" = x""yes; then :
   found=yes
 else
   found=no
@@ -19049,9 +16413,7 @@ fi
   case $found in
   yes)
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETHOSTNAME 1
-_ACEOF
+$as_echo "#define HAVE_GETHOSTNAME 1" >>confdefs.h
 
     ac_cv_func_gethostname=yes
   ;;
@@ -19061,18 +16423,14 @@ _ACEOF
   unset ac_cv_lib_nsl_gethostname
   unset ac_cv_lib_nsl___gethostname
   unset found
-  { echo "$as_me:$LINENO: checking for gethostname in -lnsl" >&5
-echo $ECHO_N "checking for gethostname in -lnsl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_nsl_gethostname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostname in -lnsl" >&5
+$as_echo_n "checking for gethostname in -lnsl... " >&6; }
+if test "${ac_cv_lib_nsl_gethostname+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -19090,54 +16448,29 @@ return gethostname ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nsl_gethostname=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_nsl_gethostname=no
+  ac_cv_lib_nsl_gethostname=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostname" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostname" >&6; }
-if test $ac_cv_lib_nsl_gethostname = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostname" >&5
+$as_echo "$ac_cv_lib_nsl_gethostname" >&6; }
+if test "x$ac_cv_lib_nsl_gethostname" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __gethostname in -lnsl" >&5
-echo $ECHO_N "checking for __gethostname in -lnsl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_nsl___gethostname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gethostname in -lnsl" >&5
+$as_echo_n "checking for __gethostname in -lnsl... " >&6; }
+if test "${ac_cv_lib_nsl___gethostname+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -19155,39 +16488,18 @@ return __gethostname ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nsl___gethostname=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_nsl___gethostname=no
+  ac_cv_lib_nsl___gethostname=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl___gethostname" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl___gethostname" >&6; }
-if test $ac_cv_lib_nsl___gethostname = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl___gethostname" >&5
+$as_echo "$ac_cv_lib_nsl___gethostname" >&6; }
+if test "x$ac_cv_lib_nsl___gethostname" = x""yes; then :
   found=yes
 else
   found=no
@@ -19200,50 +16512,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnsl"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -19259,14 +16543,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETHOSTNAME 1
-_ACEOF
+$as_echo "#define HAVE_GETHOSTNAME 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBNSL 1
-_ACEOF
+$as_echo "#define HAVE_LIBNSL 1" >>confdefs.h
 
     ac_cv_func_gethostname=yes
   else
@@ -19284,172 +16564,12 @@ _ACEOF
   unset ac_cv_func___gethostbyaddr
   unset found
 
-  { echo "$as_me:$LINENO: checking for gethostbyaddr" >&5
-echo $ECHO_N "checking for gethostbyaddr... $ECHO_C" >&6; }
-if test "${ac_cv_func_gethostbyaddr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define gethostbyaddr to an innocuous variant, in case <limits.h> declares gethostbyaddr.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define gethostbyaddr innocuous_gethostbyaddr
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostbyaddr (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef gethostbyaddr
-
-/* 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 gethostbyaddr ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_gethostbyaddr || defined __stub___gethostbyaddr
-choke me
-#endif
-
-int
-main ()
-{
-return gethostbyaddr ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_gethostbyaddr=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_gethostbyaddr=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyaddr" >&5
-echo "${ECHO_T}$ac_cv_func_gethostbyaddr" >&6; }
-if test $ac_cv_func_gethostbyaddr = yes; then
+  ac_fn_c_check_func "$LINENO" "gethostbyaddr" "ac_cv_func_gethostbyaddr"
+if test "x$ac_cv_func_gethostbyaddr" = x""yes; then :
   found=yes
 else
-   { echo "$as_me:$LINENO: checking for __gethostbyaddr" >&5
-echo $ECHO_N "checking for __gethostbyaddr... $ECHO_C" >&6; }
-if test "${ac_cv_func___gethostbyaddr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __gethostbyaddr to an innocuous variant, in case <limits.h> declares __gethostbyaddr.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __gethostbyaddr innocuous___gethostbyaddr
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __gethostbyaddr (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __gethostbyaddr
-
-/* 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 __gethostbyaddr ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub___gethostbyaddr || defined __stub_____gethostbyaddr
-choke me
-#endif
-
-int
-main ()
-{
-return __gethostbyaddr ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func___gethostbyaddr=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func___gethostbyaddr=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func___gethostbyaddr" >&5
-echo "${ECHO_T}$ac_cv_func___gethostbyaddr" >&6; }
-if test $ac_cv_func___gethostbyaddr = yes; then
+   ac_fn_c_check_func "$LINENO" "__gethostbyaddr" "ac_cv_func___gethostbyaddr"
+if test "x$ac_cv_func___gethostbyaddr" = x""yes; then :
   found=yes
 else
   found=no
@@ -19461,9 +16581,7 @@ fi
   case $found in
   yes)
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETHOSTBYADDR 1
-_ACEOF
+$as_echo "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
 
     ac_cv_func_gethostbyaddr=yes
   ;;
@@ -19473,18 +16591,14 @@ _ACEOF
   unset ac_cv_lib_nsl_gethostbyaddr
   unset ac_cv_lib_nsl___gethostbyaddr
   unset found
-  { echo "$as_me:$LINENO: checking for gethostbyaddr in -lnsl" >&5
-echo $ECHO_N "checking for gethostbyaddr in -lnsl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_nsl_gethostbyaddr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lnsl" >&5
+$as_echo_n "checking for gethostbyaddr in -lnsl... " >&6; }
+if test "${ac_cv_lib_nsl_gethostbyaddr+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -19502,54 +16616,29 @@ return gethostbyaddr ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nsl_gethostbyaddr=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_nsl_gethostbyaddr=no
+  ac_cv_lib_nsl_gethostbyaddr=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyaddr" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyaddr" >&6; }
-if test $ac_cv_lib_nsl_gethostbyaddr = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyaddr" >&5
+$as_echo "$ac_cv_lib_nsl_gethostbyaddr" >&6; }
+if test "x$ac_cv_lib_nsl_gethostbyaddr" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __gethostbyaddr in -lnsl" >&5
-echo $ECHO_N "checking for __gethostbyaddr in -lnsl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_nsl___gethostbyaddr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gethostbyaddr in -lnsl" >&5
+$as_echo_n "checking for __gethostbyaddr in -lnsl... " >&6; }
+if test "${ac_cv_lib_nsl___gethostbyaddr+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -19567,39 +16656,18 @@ return __gethostbyaddr ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nsl___gethostbyaddr=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_nsl___gethostbyaddr=no
+  ac_cv_lib_nsl___gethostbyaddr=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl___gethostbyaddr" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl___gethostbyaddr" >&6; }
-if test $ac_cv_lib_nsl___gethostbyaddr = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl___gethostbyaddr" >&5
+$as_echo "$ac_cv_lib_nsl___gethostbyaddr" >&6; }
+if test "x$ac_cv_lib_nsl___gethostbyaddr" = x""yes; then :
   found=yes
 else
   found=no
@@ -19612,50 +16680,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnsl"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -19671,14 +16711,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETHOSTBYADDR 1
-_ACEOF
+$as_echo "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBNSL 1
-_ACEOF
+$as_echo "#define HAVE_LIBNSL 1" >>confdefs.h
 
     ac_cv_func_gethostbyaddr=yes
   else
@@ -19696,172 +16732,12 @@ _ACEOF
   unset ac_cv_func___yp_get_default_domain
   unset found
 
-  { echo "$as_me:$LINENO: checking for yp_get_default_domain" >&5
-echo $ECHO_N "checking for yp_get_default_domain... $ECHO_C" >&6; }
-if test "${ac_cv_func_yp_get_default_domain+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define yp_get_default_domain to an innocuous variant, in case <limits.h> declares yp_get_default_domain.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define yp_get_default_domain innocuous_yp_get_default_domain
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char yp_get_default_domain (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef yp_get_default_domain
-
-/* 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 yp_get_default_domain ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_yp_get_default_domain || defined __stub___yp_get_default_domain
-choke me
-#endif
-
-int
-main ()
-{
-return yp_get_default_domain ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_yp_get_default_domain=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_yp_get_default_domain=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_yp_get_default_domain" >&5
-echo "${ECHO_T}$ac_cv_func_yp_get_default_domain" >&6; }
-if test $ac_cv_func_yp_get_default_domain = yes; then
+  ac_fn_c_check_func "$LINENO" "yp_get_default_domain" "ac_cv_func_yp_get_default_domain"
+if test "x$ac_cv_func_yp_get_default_domain" = x""yes; then :
   found=yes
 else
-   { echo "$as_me:$LINENO: checking for __yp_get_default_domain" >&5
-echo $ECHO_N "checking for __yp_get_default_domain... $ECHO_C" >&6; }
-if test "${ac_cv_func___yp_get_default_domain+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __yp_get_default_domain to an innocuous variant, in case <limits.h> declares __yp_get_default_domain.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __yp_get_default_domain innocuous___yp_get_default_domain
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __yp_get_default_domain (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __yp_get_default_domain
-
-/* 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 __yp_get_default_domain ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub___yp_get_default_domain || defined __stub_____yp_get_default_domain
-choke me
-#endif
-
-int
-main ()
-{
-return __yp_get_default_domain ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func___yp_get_default_domain=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func___yp_get_default_domain=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func___yp_get_default_domain" >&5
-echo "${ECHO_T}$ac_cv_func___yp_get_default_domain" >&6; }
-if test $ac_cv_func___yp_get_default_domain = yes; then
+   ac_fn_c_check_func "$LINENO" "__yp_get_default_domain" "ac_cv_func___yp_get_default_domain"
+if test "x$ac_cv_func___yp_get_default_domain" = x""yes; then :
   found=yes
 else
   found=no
@@ -19873,9 +16749,7 @@ fi
   case $found in
   yes)
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_YP_GET_DEFAULT_DOMAIN 1
-_ACEOF
+$as_echo "#define HAVE_YP_GET_DEFAULT_DOMAIN 1" >>confdefs.h
 
     ac_cv_func_yp_get_default_domain=yes
   ;;
@@ -19885,18 +16759,14 @@ _ACEOF
   unset ac_cv_lib_nsl_yp_get_default_domain
   unset ac_cv_lib_nsl___yp_get_default_domain
   unset found
-  { echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5
-echo $ECHO_N "checking for yp_get_default_domain in -lnsl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for yp_get_default_domain in -lnsl" >&5
+$as_echo_n "checking for yp_get_default_domain in -lnsl... " >&6; }
+if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -19914,54 +16784,29 @@ return yp_get_default_domain ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nsl_yp_get_default_domain=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_nsl_yp_get_default_domain=no
+  ac_cv_lib_nsl_yp_get_default_domain=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_yp_get_default_domain" >&6; }
-if test $ac_cv_lib_nsl_yp_get_default_domain = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5
+$as_echo "$ac_cv_lib_nsl_yp_get_default_domain" >&6; }
+if test "x$ac_cv_lib_nsl_yp_get_default_domain" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __yp_get_default_domain in -lnsl" >&5
-echo $ECHO_N "checking for __yp_get_default_domain in -lnsl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_nsl___yp_get_default_domain+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __yp_get_default_domain in -lnsl" >&5
+$as_echo_n "checking for __yp_get_default_domain in -lnsl... " >&6; }
+if test "${ac_cv_lib_nsl___yp_get_default_domain+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -19979,39 +16824,18 @@ return __yp_get_default_domain ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nsl___yp_get_default_domain=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_nsl___yp_get_default_domain=no
+  ac_cv_lib_nsl___yp_get_default_domain=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl___yp_get_default_domain" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl___yp_get_default_domain" >&6; }
-if test $ac_cv_lib_nsl___yp_get_default_domain = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl___yp_get_default_domain" >&5
+$as_echo "$ac_cv_lib_nsl___yp_get_default_domain" >&6; }
+if test "x$ac_cv_lib_nsl___yp_get_default_domain" = x""yes; then :
   found=yes
 else
   found=no
@@ -20024,50 +16848,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnsl"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -20083,14 +16879,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_YP_GET_DEFAULT_DOMAIN 1
-_ACEOF
+$as_echo "#define HAVE_YP_GET_DEFAULT_DOMAIN 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBNSL 1
-_ACEOF
+$as_echo "#define HAVE_LIBNSL 1" >>confdefs.h
 
     ac_cv_func_yp_get_default_domain=yes
   else
@@ -20109,172 +16901,12 @@ _ACEOF
   unset ac_cv_func___dlopen
   unset found
 
-  { echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* 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 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_dlopen || defined __stub___dlopen
-choke me
-#endif
-
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_dlopen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-if test $ac_cv_func_dlopen = yes; then
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = x""yes; then :
   found=yes
 else
-   { echo "$as_me:$LINENO: checking for __dlopen" >&5
-echo $ECHO_N "checking for __dlopen... $ECHO_C" >&6; }
-if test "${ac_cv_func___dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __dlopen to an innocuous variant, in case <limits.h> declares __dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __dlopen innocuous___dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __dlopen
-
-/* 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 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub___dlopen || defined __stub_____dlopen
-choke me
-#endif
-
-int
-main ()
-{
-return __dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func___dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func___dlopen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func___dlopen" >&5
-echo "${ECHO_T}$ac_cv_func___dlopen" >&6; }
-if test $ac_cv_func___dlopen = yes; then
+   ac_fn_c_check_func "$LINENO" "__dlopen" "ac_cv_func___dlopen"
+if test "x$ac_cv_func___dlopen" = x""yes; then :
   found=yes
 else
   found=no
@@ -20286,9 +16918,7 @@ fi
   case $found in
   yes)
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DLOPEN 1
-_ACEOF
+$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
 
     ac_cv_func_dlopen=yes
   ;;
@@ -20298,18 +16928,14 @@ _ACEOF
   unset ac_cv_lib_dl_dlopen
   unset ac_cv_lib_dl___dlopen
   unset found
-  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -20327,54 +16953,29 @@ return dlopen ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
+  ac_cv_lib_dl_dlopen=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __dlopen in -ldl" >&5
-echo $ECHO_N "checking for __dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl___dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dlopen in -ldl" >&5
+$as_echo_n "checking for __dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl___dlopen+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -20392,39 +16993,18 @@ return __dlopen ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl___dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl___dlopen=no
+  ac_cv_lib_dl___dlopen=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl___dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl___dlopen" >&6; }
-if test $ac_cv_lib_dl___dlopen = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl___dlopen" >&5
+$as_echo "$ac_cv_lib_dl___dlopen" >&6; }
+if test "x$ac_cv_lib_dl___dlopen" = x""yes; then :
   found=yes
 else
   found=no
@@ -20437,50 +17017,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -ldl"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -20496,14 +17048,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DLOPEN 1
-_ACEOF
+$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
+$as_echo "#define HAVE_LIBDL 1" >>confdefs.h
 
     ac_cv_func_dlopen=yes
   else
@@ -20518,24 +17066,17 @@ _ACEOF
 
 if test "$ac_cv_func_dlopen" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
+$as_echo "#define HAVE_LIBDL 1" >>confdefs.h
 
 fi
-
-{ echo "$as_me:$LINENO: checking for sin in -lm" >&5
-echo $ECHO_N "checking for sin in -lm... $ECHO_C" >&6; }
-if test "${ac_cv_lib_m_sin+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
+$as_echo_n "checking for sin in -lm... " >&6; }
+if test "${ac_cv_lib_m_sin+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -20553,39 +17094,18 @@ return sin ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_m_sin=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_m_sin=no
+  ac_cv_lib_m_sin=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_sin" >&5
-echo "${ECHO_T}$ac_cv_lib_m_sin" >&6; }
-if test $ac_cv_lib_m_sin = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5
+$as_echo "$ac_cv_lib_m_sin" >&6; }
+if test "x$ac_cv_lib_m_sin" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
 _ACEOF
@@ -20600,172 +17120,12 @@ fi
   unset ac_cv_func___inet_aton
   unset found
 
-  { echo "$as_me:$LINENO: checking for inet_aton" >&5
-echo $ECHO_N "checking for inet_aton... $ECHO_C" >&6; }
-if test "${ac_cv_func_inet_aton+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define inet_aton to an innocuous variant, in case <limits.h> declares inet_aton.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define inet_aton innocuous_inet_aton
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char inet_aton (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef inet_aton
-
-/* 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 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_inet_aton || defined __stub___inet_aton
-choke me
-#endif
-
-int
-main ()
-{
-return inet_aton ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_inet_aton=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_inet_aton=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_inet_aton" >&5
-echo "${ECHO_T}$ac_cv_func_inet_aton" >&6; }
-if test $ac_cv_func_inet_aton = yes; then
+  ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
+if test "x$ac_cv_func_inet_aton" = x""yes; then :
   found=yes
 else
-   { echo "$as_me:$LINENO: checking for __inet_aton" >&5
-echo $ECHO_N "checking for __inet_aton... $ECHO_C" >&6; }
-if test "${ac_cv_func___inet_aton+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __inet_aton to an innocuous variant, in case <limits.h> declares __inet_aton.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __inet_aton innocuous___inet_aton
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __inet_aton (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __inet_aton
-
-/* 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 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub___inet_aton || defined __stub_____inet_aton
-choke me
-#endif
-
-int
-main ()
-{
-return __inet_aton ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func___inet_aton=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func___inet_aton=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func___inet_aton" >&5
-echo "${ECHO_T}$ac_cv_func___inet_aton" >&6; }
-if test $ac_cv_func___inet_aton = yes; then
+   ac_fn_c_check_func "$LINENO" "__inet_aton" "ac_cv_func___inet_aton"
+if test "x$ac_cv_func___inet_aton" = x""yes; then :
   found=yes
 else
   found=no
@@ -20777,9 +17137,7 @@ fi
   case $found in
   yes)
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_INET_ATON 1
-_ACEOF
+$as_echo "#define HAVE_INET_ATON 1" >>confdefs.h
 
     ac_cv_func_inet_aton=yes
   ;;
@@ -20789,18 +17147,14 @@ _ACEOF
   unset ac_cv_lib_resolv_inet_aton
   unset ac_cv_lib_resolv___inet_aton
   unset found
-  { echo "$as_me:$LINENO: checking for inet_aton in -lresolv" >&5
-echo $ECHO_N "checking for inet_aton in -lresolv... $ECHO_C" >&6; }
-if test "${ac_cv_lib_resolv_inet_aton+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $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 test "${ac_cv_lib_resolv_inet_aton+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -20818,54 +17172,29 @@ return inet_aton ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_inet_aton=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_resolv_inet_aton=no
+  ac_cv_lib_resolv_inet_aton=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_inet_aton" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv_inet_aton" >&6; }
-if test $ac_cv_lib_resolv_inet_aton = yes; then
+{ $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" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __inet_aton in -lresolv" >&5
-echo $ECHO_N "checking for __inet_aton in -lresolv... $ECHO_C" >&6; }
-if test "${ac_cv_lib_resolv___inet_aton+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $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 test "${ac_cv_lib_resolv___inet_aton+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -20883,39 +17212,18 @@ return __inet_aton ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv___inet_aton=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_resolv___inet_aton=no
+  ac_cv_lib_resolv___inet_aton=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___inet_aton" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv___inet_aton" >&6; }
-if test $ac_cv_lib_resolv___inet_aton = yes; then
+{ $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" = x""yes; then :
   found=yes
 else
   found=no
@@ -20928,50 +17236,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lresolv"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -20987,14 +17267,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_INET_ATON 1
-_ACEOF
+$as_echo "#define HAVE_INET_ATON 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBRESOLV 1
-_ACEOF
+$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_inet_aton=yes
   else
@@ -21003,18 +17279,14 @@ _ACEOF
   unset ac_cv_lib_bind_inet_aton
   unset ac_cv_lib_bind___inet_aton
   unset found
-  { echo "$as_me:$LINENO: checking for inet_aton in -lbind" >&5
-echo $ECHO_N "checking for inet_aton in -lbind... $ECHO_C" >&6; }
-if test "${ac_cv_lib_bind_inet_aton+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lbind" >&5
+$as_echo_n "checking for inet_aton in -lbind... " >&6; }
+if test "${ac_cv_lib_bind_inet_aton+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -21032,54 +17304,29 @@ return inet_aton ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_inet_aton=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_bind_inet_aton=no
+  ac_cv_lib_bind_inet_aton=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bind_inet_aton" >&5
-echo "${ECHO_T}$ac_cv_lib_bind_inet_aton" >&6; }
-if test $ac_cv_lib_bind_inet_aton = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_inet_aton" >&5
+$as_echo "$ac_cv_lib_bind_inet_aton" >&6; }
+if test "x$ac_cv_lib_bind_inet_aton" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __inet_aton in -lbind" >&5
-echo $ECHO_N "checking for __inet_aton in -lbind... $ECHO_C" >&6; }
-if test "${ac_cv_lib_bind___inet_aton+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __inet_aton in -lbind" >&5
+$as_echo_n "checking for __inet_aton in -lbind... " >&6; }
+if test "${ac_cv_lib_bind___inet_aton+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -21097,39 +17344,18 @@ return __inet_aton ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind___inet_aton=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_bind___inet_aton=no
+  ac_cv_lib_bind___inet_aton=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bind___inet_aton" >&5
-echo "${ECHO_T}$ac_cv_lib_bind___inet_aton" >&6; }
-if test $ac_cv_lib_bind___inet_aton = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___inet_aton" >&5
+$as_echo "$ac_cv_lib_bind___inet_aton" >&6; }
+if test "x$ac_cv_lib_bind___inet_aton" = x""yes; then :
   found=yes
 else
   found=no
@@ -21142,50 +17368,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbind"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -21201,14 +17399,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_INET_ATON 1
-_ACEOF
+$as_echo "#define HAVE_INET_ATON 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBBIND 1
-_ACEOF
+$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_inet_aton=yes
   else
@@ -21226,16 +17420,12 @@ _ACEOF
 
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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 test "${ac_cv_header_stdc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -21250,85 +17440,53 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
+  ac_cv_header_stdc=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
-rm -f -r conftest*
+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 >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -21355,69 +17513,34 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&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
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 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=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  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 { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -21431,39 +17554,20 @@ return 0;
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+eval ac_res=\$$as_ac_Header
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
 _ACEOF
 
 ac_header_dirent=$ac_hdr; break
@@ -21472,17 +17576,13 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+$as_echo_n "checking for library containing opendir... " >&6; }
+if test "${ac_cv_search_opendir+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -21507,66 +17607,39 @@ for ac_lib in '' dir; do
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_opendir=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_opendir+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_opendir+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_opendir+set}" = set; then
-  :
+if test "${ac_cv_search_opendir+set}" = set; then :
+
 else
   ac_cv_search_opendir=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$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
 
 else
-  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+$as_echo_n "checking for library containing opendir... " >&6; }
+if test "${ac_cv_search_opendir+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -21591,50 +17664,27 @@ for ac_lib in '' x; do
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_opendir=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_opendir+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_opendir+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_opendir+set}" = set; then
-  :
+if test "${ac_cv_search_opendir+set}" = set; then :
+
 else
   ac_cv_search_opendir=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$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
@@ -21642,60 +17692,6 @@ fi
 fi
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 for ac_header in  \
 inttypes.h \
 stdint.h \
@@ -21752,20 +17748,9 @@ sys/ipc.h \
 dlfcn.h \
 assert.h
 
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.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_PARAM_H
 #include <sys/param.h>
 #endif
@@ -21782,42 +17767,11 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <arpa/nameser.h>
 #endif
 
-
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -21826,98 +17780,14 @@ done
 
 
 
-  { echo "$as_me:$LINENO: checking for fopencookie" >&5
-echo $ECHO_N "checking for fopencookie... $ECHO_C" >&6; }
-if test "${ac_cv_func_fopencookie+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define fopencookie to an innocuous variant, in case <limits.h> declares fopencookie.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define fopencookie innocuous_fopencookie
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char fopencookie (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef fopencookie
-
-/* 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 fopencookie ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_fopencookie || defined __stub___fopencookie
-choke me
-#endif
-
-int
-main ()
-{
-return fopencookie ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_fopencookie=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_fopencookie=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_fopencookie" >&5
-echo "${ECHO_T}$ac_cv_func_fopencookie" >&6; }
-if test $ac_cv_func_fopencookie = yes; then
+  ac_fn_c_check_func "$LINENO" "fopencookie" "ac_cv_func_fopencookie"
+if test "x$ac_cv_func_fopencookie" = x""yes; then :
   have_glibc_fopencookie=yes
 fi
 
 
   if test "$have_glibc_fopencookie" = "yes"; then
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #define _GNU_SOURCE
@@ -21931,47 +17801,21 @@ cookie_io_functions_t cookie;
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   have_cookie_io_functions_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
     if test "$have_cookie_io_functions_t" = "yes"; then
       cookie_io_functions_t=cookie_io_functions_t
       have_fopen_cookie=yes
 
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
 
   cookie_io_functions_use_off64_t=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #define _GNU_SOURCE
@@ -22003,51 +17847,23 @@ main() {
 
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
   cookie_io_functions_use_off64_t=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
   cookie_io_functions_use_off64_t=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
-
     else
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #define _GNU_SOURCE
@@ -22061,31 +17877,9 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   have_IO_cookie_io_functions_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
       if test "$have_cookie_io_functions_t" = "yes" ; then
         cookie_io_functions_t=_IO_cookie_io_functions_t
@@ -22095,9 +17889,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
     if test "$have_fopen_cookie" = "yes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FOPENCOOKIE 1
-_ACEOF
+$as_echo "#define HAVE_FOPENCOOKIE 1" >>confdefs.h
 
 
 cat >>confdefs.h <<_ACEOF
@@ -22106,45 +17898,37 @@ _ACEOF
 
       if test "$cookie_io_functions_use_off64_t" = "yes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define COOKIE_SEEKER_USES_OFF64_T 1
-_ACEOF
+$as_echo "#define COOKIE_SEEKER_USES_OFF64_T 1" >>confdefs.h
 
       fi
     fi
   fi
 
 
-  { echo "$as_me:$LINENO: checking for broken getcwd" >&5
-echo $ECHO_N "checking for broken getcwd... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken getcwd" >&5
+$as_echo_n "checking for broken getcwd... " >&6; }
   os=`uname -sr 2>/dev/null`
   case $os in
     SunOS*)
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BROKEN_GETCWD 1
-_ACEOF
+$as_echo "#define HAVE_BROKEN_GETCWD 1" >>confdefs.h
 
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; };;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; };;
     *)
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; };;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; };;
   esac
 
 
-  { echo "$as_me:$LINENO: checking for broken libc stdio" >&5
-echo $ECHO_N "checking for broken libc stdio... $ECHO_C" >&6; }
-  if test "${_cv_have_broken_glibc_fopen_append+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken libc stdio" >&5
+$as_echo_n "checking for broken libc stdio... " >&6; }
+  if test "${_cv_have_broken_glibc_fopen_append+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-  if test "$cross_compiling" = yes; then
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  if test "$cross_compiling" = yes; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <features.h>
@@ -22161,39 +17945,15 @@ choke me
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   _cv_have_broken_glibc_fopen_append=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	_cv_have_broken_glibc_fopen_append=no
+  _cv_have_broken_glibc_fopen_append=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -22221,67 +17981,37 @@ int main(int argc, char *argv[])
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   _cv_have_broken_glibc_fopen_append=no
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-_cv_have_broken_glibc_fopen_append=yes
+  _cv_have_broken_glibc_fopen_append=yes
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
 
 
   if test "$_cv_have_broken_glibc_fopen_append" = "yes"; then
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BROKEN_GLIBC_FOPEN_APPEND 1
-_ACEOF
+$as_echo "#define HAVE_BROKEN_GLIBC_FOPEN_APPEND 1" >>confdefs.h
 
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
 
-{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
-if test "${ac_cv_struct_tm+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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 test "${ac_cv_struct_tm+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <time.h>
@@ -22291,148 +18021,31 @@ main ()
 {
 struct tm tm;
 				     int *p = &tm.tm_sec;
- 				     return !p;
+				     return !p;
   ;
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_struct_tm=time.h
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_struct_tm=sys/time.h
+  ac_cv_struct_tm=sys/time.h
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-echo "${ECHO_T}$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
 
-cat >>confdefs.h <<\_ACEOF
-#define TM_IN_SYS_TIME 1
-_ACEOF
+$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
-echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <$ac_cv_struct_tm>
-
-
-int
-main ()
-{
-static struct tm ac_aggr;
-if (ac_aggr.tm_zone)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_tm_tm_zone=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
+ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include <sys/types.h>
 #include <$ac_cv_struct_tm>
 
-
-int
-main ()
-{
-static struct tm ac_aggr;
-if (sizeof ac_aggr.tm_zone)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_tm_tm_zone=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_tm_tm_zone=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
-echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6; }
-if test $ac_cv_member_struct_tm_tm_zone = yes; then
+"
+if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_TM_TM_ZONE 1
@@ -22443,90 +18056,27 @@ fi
 
 if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_TM_ZONE 1
-_ACEOF
+$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h
 
 else
-  { echo "$as_me:$LINENO: checking whether tzname is declared" >&5
-echo $ECHO_N "checking whether tzname is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_tzname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <time.h>
-
-int
-main ()
-{
-#ifndef tzname
-  (void) tzname;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_have_decl_tzname=yes
+  ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
+"
+if test "x$ac_cv_have_decl_tzname" = x""yes; then :
+  ac_have_decl=1
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_have_decl_tzname=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_have_decl=0
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5
-echo "${ECHO_T}$ac_cv_have_decl_tzname" >&6; }
-if test $ac_cv_have_decl_tzname = yes; then
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_TZNAME 1
+#define HAVE_DECL_TZNAME $ac_have_decl
 _ACEOF
 
-
-else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_TZNAME 0
-_ACEOF
-
-
-fi
-
-
-  { echo "$as_me:$LINENO: checking for tzname" >&5
-echo $ECHO_N "checking for tzname... $ECHO_C" >&6; }
-if test "${ac_cv_var_tzname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
+$as_echo_n "checking for tzname... " >&6; }
+if test "${ac_cv_var_tzname+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 #if !HAVE_DECL_TZNAME
@@ -22541,55 +18091,28 @@ return tzname[0][0];
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_var_tzname=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_var_tzname=no
+  ac_cv_var_tzname=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
-echo "${ECHO_T}$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
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_TZNAME 1
-_ACEOF
+$as_echo "#define HAVE_TZNAME 1" >>confdefs.h
 
   fi
 fi
 
 
 
-  { echo "$as_me:$LINENO: checking for missing declarations of reentrant functions" >&5
-echo $ECHO_N "checking for missing declarations of reentrant functions... $ECHO_C" >&6; }
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for missing declarations of reentrant functions" >&5
+$as_echo_n "checking for missing declarations of reentrant functions... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 int
@@ -22600,45 +18123,19 @@ struct tm *(*func)() = localtime_r
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
     :
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-
-cat >>confdefs.h <<\_ACEOF
-#define MISSING_LOCALTIME_R_DECL 1
-_ACEOF
+$as_echo "#define MISSING_LOCALTIME_R_DECL 1" >>confdefs.h
 
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 int
@@ -22649,45 +18146,19 @@ struct tm *(*func)() = gmtime_r
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
     :
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-
-cat >>confdefs.h <<\_ACEOF
-#define MISSING_GMTIME_R_DECL 1
-_ACEOF
+$as_echo "#define MISSING_GMTIME_R_DECL 1" >>confdefs.h
 
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 int
@@ -22698,45 +18169,19 @@ char *(*func)() = asctime_r
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
     :
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-
-cat >>confdefs.h <<\_ACEOF
-#define MISSING_ASCTIME_R_DECL 1
-_ACEOF
+$as_echo "#define MISSING_ASCTIME_R_DECL 1" >>confdefs.h
 
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 int
@@ -22747,45 +18192,19 @@ char *(*func)() = ctime_r
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
     :
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
 
-cat >>confdefs.h <<\_ACEOF
-#define MISSING_CTIME_R_DECL 1
-_ACEOF
+$as_echo "#define MISSING_CTIME_R_DECL 1" >>confdefs.h
 
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 int
@@ -22796,51 +18215,25 @@ char *(*func)() = strtok_r
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
     :
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
-
-cat >>confdefs.h <<\_ACEOF
-#define MISSING_STRTOK_R_DECL 1
-_ACEOF
+$as_echo "#define MISSING_STRTOK_R_DECL 1" >>confdefs.h
 
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  { echo "$as_me:$LINENO: result: done" >&5
-echo "${ECHO_T}done" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
 
 
-  { echo "$as_me:$LINENO: checking for fclose declaration" >&5
-echo $ECHO_N "checking for fclose declaration... $ECHO_C" >&6; }
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fclose declaration" >&5
+$as_echo_n "checking for fclose declaration... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
@@ -22851,61 +18244,33 @@ int (*func)() = fclose
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define MISSING_FCLOSE_DECL 0
-_ACEOF
+$as_echo "#define MISSING_FCLOSE_DECL 0" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
 
+$as_echo "#define MISSING_FCLOSE_DECL 1" >>confdefs.h
 
-cat >>confdefs.h <<\_ACEOF
-#define MISSING_FCLOSE_DECL 1
-_ACEOF
-
-    { echo "$as_me:$LINENO: result: missing" >&5
-echo "${ECHO_T}missing" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: missing" >&5
+$as_echo "missing" >&6; }
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
-{ echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
-echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6; }
-if test "${ac_cv_struct_tm_gmtoff+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tm_gmtoff in struct tm" >&5
+$as_echo_n "checking for tm_gmtoff in struct tm... " >&6; }
+if test "${ac_cv_struct_tm_gmtoff+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -22917,55 +18282,29 @@ struct tm tm; tm.tm_gmtoff;
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_struct_tm_gmtoff=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_struct_tm_gmtoff=no
+  ac_cv_struct_tm_gmtoff=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm_gmtoff" >&5
-echo "${ECHO_T}$ac_cv_struct_tm_gmtoff" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm_gmtoff" >&5
+$as_echo "$ac_cv_struct_tm_gmtoff" >&6; }
 
 if test "$ac_cv_struct_tm_gmtoff" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_TM_GMTOFF 1
-_ACEOF
+$as_echo "#define HAVE_TM_GMTOFF 1" >>confdefs.h
 
 fi
 
 
-{ echo "$as_me:$LINENO: checking for struct flock" >&5
-echo $ECHO_N "checking for struct flock... $ECHO_C" >&6; }
-if test "${ac_cv_struct_flock+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct flock" >&5
+$as_echo_n "checking for struct flock... " >&6; }
+if test "${ac_cv_struct_flock+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <unistd.h>
@@ -22979,59 +18318,33 @@ struct flock x;
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
           ac_cv_struct_flock=yes
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
           ac_cv_struct_flock=no
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_struct_flock" >&5
-echo "${ECHO_T}$ac_cv_struct_flock" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_flock" >&5
+$as_echo "$ac_cv_struct_flock" >&6; }
 if test "$ac_cv_struct_flock" = "yes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_FLOCK 1
-_ACEOF
+$as_echo "#define HAVE_STRUCT_FLOCK 1" >>confdefs.h
 
 fi
 
 
-{ echo "$as_me:$LINENO: checking for socklen_t" >&5
-echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
-if test "${ac_cv_socklen_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5
+$as_echo_n "checking for socklen_t... " >&6; }
+if test "${ac_cv_socklen_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -23047,445 +18360,52 @@ socklen_t x;
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
   ac_cv_socklen_t=yes
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
   ac_cv_socklen_t=no
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_socklen_t" >&5
-echo "${ECHO_T}$ac_cv_socklen_t" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_socklen_t" >&5
+$as_echo "$ac_cv_socklen_t" >&6; }
 if test "$ac_cv_socklen_t" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SOCKLEN_T 1
-_ACEOF
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef size_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_size_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+$as_echo "#define HAVE_SOCKLEN_T 1" >>confdefs.h
 
-	ac_cv_type_size_t=no
 fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
 
 # 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.
-{ echo "$as_me:$LINENO: checking size of size_t" >&5
-echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef size_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef size_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef size_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef size_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef size_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
+$as_echo_n "checking size of size_t... " >&6; }
+if test "${ac_cv_sizeof_size_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"; then :
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_size_t=$ac_lo;;
-'') if test "$ac_cv_type_size_t" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (size_t)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_size_t=0
-   fi ;;
-esac
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef size_t ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_size_t=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_size_t" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (size_t)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_size_t" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (size_t)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_size_t=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
-echo "${ECHO_T}$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; }
 
 
 
@@ -23494,403 +18414,32 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long long ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_long_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
-
 # 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.
-{ echo "$as_me:$LINENO: checking size of long long" >&5
-echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+$as_echo_n "checking size of long long... " >&6; }
+if test "${ac_cv_sizeof_long_long+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
 
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_long=$ac_lo;;
-'') if test "$ac_cv_type_long_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_long=0
-   fi ;;
-esac
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_long_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_long_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long long)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_long_long=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-echo "${ECHO_T}$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; }
 
 
 
@@ -23899,403 +18448,32 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking for long long int" >&5
-echo $ECHO_N "checking for long long int... $ECHO_C" >&6; }
-if test "${ac_cv_type_long_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long long int ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_long_long_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long_long_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5
-echo "${ECHO_T}$ac_cv_type_long_long_int" >&6; }
-
 # 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.
-{ echo "$as_me:$LINENO: checking size of long long int" >&5
-echo $ECHO_N "checking size of long long int... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_long_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long int" >&5
+$as_echo_n "checking size of long long int... " >&6; }
+if test "${ac_cv_sizeof_long_long_int+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long int))" "ac_cv_sizeof_long_long_int"        "$ac_includes_default"; then :
 
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_long_int=$ac_lo;;
-'') if test "$ac_cv_type_long_long_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_long_int=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long int ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_long_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_long_long_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_long_long_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long long int)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_long_long_int=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_long_int" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long_int" >&5
+$as_echo "$ac_cv_sizeof_long_long_int" >&6; }
 
 
 
@@ -24304,403 +18482,32 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6; }
-
 # 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.
-{ echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if test "${ac_cv_sizeof_long+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
 
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long=$ac_lo;;
-'') if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_long=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$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; }
 
 
 
@@ -24709,403 +18516,32 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6; }
-if test "${ac_cv_type_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef int ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6; }
-
 # 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.
-{ echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
+if test "${ac_cv_sizeof_int+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
 
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_int=$ac_lo;;
-'') if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_int=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (int)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_int=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$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; }
 
 
 
@@ -25116,28 +18552,24 @@ _ACEOF
 
 
 
-  { echo "$as_me:$LINENO: checking size of intmax_t" >&5
-echo $ECHO_N "checking size of intmax_t... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of intmax_t" >&5
+$as_echo_n "checking size of intmax_t... " >&6; }
 
   php_cache_value=php_cv_sizeof_intmax_t
-  if test "${php_cv_sizeof_intmax_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if test "${php_cv_sizeof_intmax_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
     old_LIBS=$LIBS
     LIBS=
     old_LDFLAGS=$LDFLAGS
     LDFLAGS=
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
 
     eval $php_cache_value=0
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 #if STDC_HEADERS
@@ -25161,43 +18593,19 @@ int main()
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     eval $php_cache_value=`cat conftestval`
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     eval $php_cache_value=0
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
 
@@ -25219,32 +18627,28 @@ _ACEOF
 
   fi
 
-  { echo "$as_me:$LINENO: result: $php_cv_sizeof_intmax_t" >&5
-echo "${ECHO_T}$php_cv_sizeof_intmax_t" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_intmax_t" >&5
+$as_echo "$php_cv_sizeof_intmax_t" >&6; }
 
 
-  { echo "$as_me:$LINENO: checking size of ssize_t" >&5
-echo $ECHO_N "checking size of ssize_t... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5
+$as_echo_n "checking size of ssize_t... " >&6; }
 
   php_cache_value=php_cv_sizeof_ssize_t
-  if test "${php_cv_sizeof_ssize_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if test "${php_cv_sizeof_ssize_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
     old_LIBS=$LIBS
     LIBS=
     old_LDFLAGS=$LDFLAGS
     LDFLAGS=
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
 
     eval $php_cache_value=8
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 #if STDC_HEADERS
@@ -25268,43 +18672,19 @@ int main()
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     eval $php_cache_value=`cat conftestval`
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     eval $php_cache_value=0
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
 
@@ -25326,32 +18706,28 @@ _ACEOF
 
   fi
 
-  { echo "$as_me:$LINENO: result: $php_cv_sizeof_ssize_t" >&5
-echo "${ECHO_T}$php_cv_sizeof_ssize_t" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_ssize_t" >&5
+$as_echo "$php_cv_sizeof_ssize_t" >&6; }
 
 
-  { echo "$as_me:$LINENO: checking size of ptrdiff_t" >&5
-echo $ECHO_N "checking size of ptrdiff_t... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ptrdiff_t" >&5
+$as_echo_n "checking size of ptrdiff_t... " >&6; }
 
   php_cache_value=php_cv_sizeof_ptrdiff_t
-  if test "${php_cv_sizeof_ptrdiff_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if test "${php_cv_sizeof_ptrdiff_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
     old_LIBS=$LIBS
     LIBS=
     old_LDFLAGS=$LDFLAGS
     LDFLAGS=
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
 
     eval $php_cache_value=8
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 #if STDC_HEADERS
@@ -25375,43 +18751,19 @@ int main()
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     eval $php_cache_value=`cat conftestval`
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     eval $php_cache_value=0
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
 
@@ -25433,221 +18785,33 @@ _ACEOF
 
   fi
 
-  { echo "$as_me:$LINENO: result: $php_cv_sizeof_ptrdiff_t" >&5
-echo "${ECHO_T}$php_cv_sizeof_ptrdiff_t" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_ptrdiff_t" >&5
+$as_echo "$php_cv_sizeof_ptrdiff_t" >&6; }
 
 
-{ echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5
-echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (ac_aggr.st_blksize)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_blksize=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_blksize)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_blksize=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_stat_st_blksize=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6; }
-if test $ac_cv_member_struct_stat_st_blksize = yes; then
+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" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
 _ACEOF
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ST_BLKSIZE 1
-_ACEOF
+$as_echo "#define HAVE_ST_BLKSIZE 1" >>confdefs.h
 
 fi
 
 
 if test "`uname -s 2>/dev/null`" != "QNX"; then
-  { echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5
-echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (ac_aggr.st_blocks)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_blocks=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_blocks)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_blocks=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_stat_st_blocks=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blocks" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6; }
-if test $ac_cv_member_struct_stat_st_blocks = yes; then
+  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" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_BLOCKS 1
 _ACEOF
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ST_BLOCKS 1
-_ACEOF
+$as_echo "#define HAVE_ST_BLOCKS 1" >>confdefs.h
 
 else
   case " $LIBOBJS " in
@@ -25660,173 +18824,27 @@ fi
 
 
 else
-  { echo "$as_me:$LINENO: WARNING: warnings level for cc set to 0" >&5
-echo "$as_me: WARNING: warnings level for cc set to 0" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: warnings level for cc set to 0" >&5
+$as_echo "$as_me: WARNING: warnings level for cc set to 0" >&2;}
   WARNING_LEVEL=0
 fi
-{ echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
-echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6; }
-if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (ac_aggr.st_rdev)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_rdev=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static struct stat ac_aggr;
-if (sizeof ac_aggr.st_rdev)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_member_struct_stat_st_rdev=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_member_struct_stat_st_rdev=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
-echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6; }
-if test $ac_cv_member_struct_stat_st_rdev = yes; then
+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" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_RDEV 1
 _ACEOF
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ST_RDEV 1
-_ACEOF
+$as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
 
 fi
 
 
 
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef size_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_size_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = x""yes; then :
 
-	ac_cv_type_size_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-if test $ac_cv_type_size_t = yes; then
-  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -25835,56 +18853,44 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
-if test "${ac_cv_type_uid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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 test "${ac_cv_type_uid_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 
 _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
   ac_cv_type_uid_t=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-echo "${ECHO_T}$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
 
-cat >>confdefs.h <<\_ACEOF
-#define uid_t int
-_ACEOF
+$as_echo "#define uid_t int" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define gid_t int
-_ACEOF
+$as_echo "#define gid_t int" >>confdefs.h
 
 fi
 
 
 
-    { echo "$as_me:$LINENO: checking for struct sockaddr_storage" >&5
-echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6; }
-if test "${ac_cv_sockaddr_storage+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5
+$as_echo_n "checking for struct sockaddr_storage... " >&6; }
+if test "${ac_cv_sockaddr_storage+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -25896,54 +18902,28 @@ struct sockaddr_storage s; s
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_sockaddr_storage=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_sockaddr_storage=no
+  ac_cv_sockaddr_storage=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sockaddr_storage" >&5
-echo "${ECHO_T}$ac_cv_sockaddr_storage" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sockaddr_storage" >&5
+$as_echo "$ac_cv_sockaddr_storage" >&6; }
   if test "$ac_cv_sockaddr_storage" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SOCKADDR_STORAGE 1
-_ACEOF
+$as_echo "#define HAVE_SOCKADDR_STORAGE 1" >>confdefs.h
 
   fi
-    { echo "$as_me:$LINENO: checking for field sa_len in struct sockaddr" >&5
-echo $ECHO_N "checking for field sa_len in struct sockaddr... $ECHO_C" >&6; }
-if test "${ac_cv_sockaddr_sa_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for field sa_len in struct sockaddr" >&5
+$as_echo_n "checking for field sa_len in struct sockaddr... " >&6; }
+if test "${ac_cv_sockaddr_sa_len+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -25955,55 +18935,29 @@ static struct sockaddr sa; int n = (int) sa.sa_len; return n;
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_sockaddr_sa_len=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_sockaddr_sa_len=no
+  ac_cv_sockaddr_sa_len=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sockaddr_sa_len" >&5
-echo "${ECHO_T}$ac_cv_sockaddr_sa_len" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sockaddr_sa_len" >&5
+$as_echo "$ac_cv_sockaddr_sa_len" >&6; }
   if test "$ac_cv_sockaddr_sa_len" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SOCKADDR_SA_LEN 1
-_ACEOF
+$as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h
 
   fi
 
 
-{ echo "$as_me:$LINENO: checking for IPv6 support" >&5
-echo $ECHO_N "checking for IPv6 support... $ECHO_C" >&6; }
-if test "${ac_cv_ipv6_support+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPv6 support" >&5
+$as_echo_n "checking for IPv6 support... " >&6; }
+if test "${ac_cv_ipv6_support+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
  #include <sys/types.h>
 #include <sys/socket.h>
@@ -26016,216 +18970,30 @@ struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_ad
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_ipv6_support=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_ipv6_support=no
+  ac_cv_ipv6_support=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_ipv6_support" >&5
-echo "${ECHO_T}$ac_cv_ipv6_support" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ipv6_support" >&5
+$as_echo "$ac_cv_ipv6_support" >&6; }
 
 
 for ac_func in vprintf
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+do :
+  ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
+if test "x$ac_cv_func_vprintf" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-{ echo "$as_me:$LINENO: checking for _doprnt" >&5
-echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6; }
-if test "${ac_cv_func__doprnt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define _doprnt innocuous__doprnt
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char _doprnt (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef _doprnt
-
-/* 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 _doprnt ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub__doprnt || defined __stub____doprnt
-choke me
-#endif
-
-int
-main ()
-{
-return _doprnt ();
-  ;
-  return 0;
-}
+#define HAVE_VPRINTF 1
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func__doprnt=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_func__doprnt=no
-fi
+ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
+if test "x$ac_cv_func__doprnt" = x""yes; then :
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
-echo "${ECHO_T}$ac_cv_func__doprnt" >&6; }
-if test $ac_cv_func__doprnt = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DOPRNT 1
-_ACEOF
+$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
 
 fi
 
@@ -26233,88 +19001,6 @@ fi
 done
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 for ac_func in alphasort \
 asctime_r \
 chroot \
@@ -26398,93 +19084,13 @@ vasprintf \
 asprintf \
 nanosleep \
 
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+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"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -26496,18 +19102,14 @@ done
   unset ac_cv_lib_rt_nanosleep
   unset ac_cv_lib_rt___nanosleep
   unset found
-  { echo "$as_me:$LINENO: checking for nanosleep in -lrt" >&5
-echo $ECHO_N "checking for nanosleep in -lrt... $ECHO_C" >&6; }
-if test "${ac_cv_lib_rt_nanosleep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5
+$as_echo_n "checking for nanosleep in -lrt... " >&6; }
+if test "${ac_cv_lib_rt_nanosleep+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -26525,54 +19127,29 @@ return nanosleep ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_rt_nanosleep=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_rt_nanosleep=no
+  ac_cv_lib_rt_nanosleep=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_nanosleep" >&5
-echo "${ECHO_T}$ac_cv_lib_rt_nanosleep" >&6; }
-if test $ac_cv_lib_rt_nanosleep = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_nanosleep" >&5
+$as_echo "$ac_cv_lib_rt_nanosleep" >&6; }
+if test "x$ac_cv_lib_rt_nanosleep" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __nanosleep in -lrt" >&5
-echo $ECHO_N "checking for __nanosleep in -lrt... $ECHO_C" >&6; }
-if test "${ac_cv_lib_rt___nanosleep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __nanosleep in -lrt" >&5
+$as_echo_n "checking for __nanosleep in -lrt... " >&6; }
+if test "${ac_cv_lib_rt___nanosleep+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -26590,39 +19167,18 @@ return __nanosleep ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_rt___nanosleep=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_rt___nanosleep=no
+  ac_cv_lib_rt___nanosleep=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt___nanosleep" >&5
-echo "${ECHO_T}$ac_cv_lib_rt___nanosleep" >&6; }
-if test $ac_cv_lib_rt___nanosleep = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt___nanosleep" >&5
+$as_echo "$ac_cv_lib_rt___nanosleep" >&6; }
+if test "x$ac_cv_lib_rt___nanosleep" = x""yes; then :
   found=yes
 else
   found=no
@@ -26635,50 +19191,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lrt"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -26694,14 +19222,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NANOSLEEP 1
-_ACEOF
+$as_echo "#define HAVE_NANOSLEEP 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBRT 1
-_ACEOF
+$as_echo "#define HAVE_LIBRT 1" >>confdefs.h
 
     ac_cv_func_nanosleep=yes
   else
@@ -26712,16 +19236,12 @@ _ACEOF
 
 
 
-{ echo "$as_me:$LINENO: checking for getaddrinfo" >&5
-echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6; }
-if test "${ac_cv_func_getaddrinfo+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5
+$as_echo_n "checking for getaddrinfo... " >&6; }
+if test "${ac_cv_func_getaddrinfo+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netdb.h>
 int
@@ -26732,32 +19252,11 @@ struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  if test "$cross_compiling" = yes; then
+if ac_fn_c_try_link "$LINENO"; then :
+  if test "$cross_compiling" = yes; then :
   ac_cv_func_getaddrinfo=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <netdb.h>
@@ -26797,69 +19296,35 @@ int main(void) {
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_getaddrinfo=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_getaddrinfo=no
+  ac_cv_func_getaddrinfo=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_getaddrinfo=no
+  ac_cv_func_getaddrinfo=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5
-echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getaddrinfo" >&5
+$as_echo "$ac_cv_func_getaddrinfo" >&6; }
 if test "$ac_cv_func_getaddrinfo" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETADDRINFO 1
-_ACEOF
+$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking for __sync_fetch_and_add" >&5
-echo $ECHO_N "checking for __sync_fetch_and_add... $ECHO_C" >&6; }
-if test "${ac_cv_func_sync_fetch_and_add+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __sync_fetch_and_add" >&5
+$as_echo_n "checking for __sync_fetch_and_add... " >&6; }
+if test "${ac_cv_func_sync_fetch_and_add+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -26870,136 +19335,30 @@ int x;__sync_fetch_and_add(&x,1);
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_func_sync_fetch_and_add=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_sync_fetch_and_add=no
+  ac_cv_func_sync_fetch_and_add=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_sync_fetch_and_add" >&5
-echo "${ECHO_T}$ac_cv_func_sync_fetch_and_add" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_sync_fetch_and_add" >&5
+$as_echo "$ac_cv_func_sync_fetch_and_add" >&6; }
 if test "$ac_cv_func_sync_fetch_and_add" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYNC_FETCH_AND_ADD 1
-_ACEOF
+$as_echo "#define HAVE_SYNC_FETCH_AND_ADD 1" >>confdefs.h
 
 fi
 
-
-
-
 for ac_func in strlcat strlcpy getopt
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+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"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 else
@@ -27016,140 +19375,15 @@ done
 
 
 
-
-for ac_header in $ac_header_list
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  for ac_header in $ac_header_list
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -27159,26 +19393,17 @@ done
 
 
 
-
-
-
-
-
-{ echo "$as_me:$LINENO: checking whether utime accepts a null argument" >&5
-echo $ECHO_N "checking whether utime accepts a null argument... $ECHO_C" >&6; }
-if test "${ac_cv_func_utime_null+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether utime accepts a null argument" >&5
+$as_echo_n "checking whether utime accepts a null argument... " >&6; }
+if test "${ac_cv_func_utime_null+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   rm -f conftest.data; >conftest.data
 # Sequent interprets utime(file, 0) to mean use start of epoch.  Wrong.
-if test "$cross_compiling" = yes; then
-  ac_cv_func_utime_null=no
+if test "$cross_compiling" = yes; then :
+  ac_cv_func_utime_null='guessing yes'
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 	       #ifdef HAVE_UTIME_H
@@ -27197,63 +19422,34 @@ struct stat s, t;
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_utime_null=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_utime_null=no
+  ac_cv_func_utime_null=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_utime_null" >&5
-echo "${ECHO_T}$ac_cv_func_utime_null" >&6; }
-if test $ac_cv_func_utime_null = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_utime_null" >&5
+$as_echo "$ac_cv_func_utime_null" >&6; }
+if test "x$ac_cv_func_utime_null" != xno; then
+  ac_cv_func_utime_null=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UTIME_NULL 1
-_ACEOF
+$as_echo "#define HAVE_UTIME_NULL 1" >>confdefs.h
 
 fi
 rm -f conftest.data
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ echo "$as_me:$LINENO: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if test "${ac_cv_working_alloca_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <alloca.h>
 int
@@ -27265,55 +19461,28 @@ char *p = (char *) alloca (2 * sizeof (int));
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_working_alloca_h=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_working_alloca_h=no
+  ac_cv_working_alloca_h=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA_H 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if test "${ac_cv_func_alloca_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -27345,43 +19514,20 @@ char *p = (char *) alloca (1);
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_func_alloca_works=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_alloca_works=no
+  ac_cv_func_alloca_works=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
 
 else
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -27391,21 +19537,15 @@ else
 
 ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
-cat >>confdefs.h <<\_ACEOF
-#define C_ALLOCA 1
-_ACEOF
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
 
 
-{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }
-if test "${ac_cv_os_cray+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if test "${ac_cv_os_cray+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #if defined CRAY && ! defined CRAY2
 webecray
@@ -27415,102 +19555,22 @@ wenotbecray
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then
+  $EGREP "webecray" >/dev/null 2>&1; then :
   ac_cv_os_cray=yes
 else
   ac_cv_os_cray=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -27522,19 +19582,15 @@ fi
   done
 fi
 
-{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if test "${ac_cv_c_stack_direction+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_c_stack_direction=0
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -27557,43 +19613,18 @@ main ()
   return find_stack_direction () < 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_stack_direction=1
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_stack_direction=-1
+  ac_cv_c_stack_direction=-1
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
 cat >>confdefs.h <<_ACEOF
 #define STACK_DIRECTION $ac_cv_c_stack_direction
 _ACEOF
@@ -27602,17 +19633,13 @@ _ACEOF
 fi
 
 
-  { echo "$as_me:$LINENO: checking for declared timezone" >&5
-echo $ECHO_N "checking for declared timezone... $ECHO_C" >&6; }
-if test "${ac_cv_declared_timezone+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for declared timezone" >&5
+$as_echo_n "checking for declared timezone... " >&6; }
+if test "${ac_cv_declared_timezone+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -27631,64 +19658,38 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
   ac_cv_declared_timezone=yes
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
   ac_cv_declared_timezone=no
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_declared_timezone" >&5
-echo "${ECHO_T}$ac_cv_declared_timezone" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_declared_timezone" >&5
+$as_echo "$ac_cv_declared_timezone" >&6; }
   if test "$ac_cv_declared_timezone" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DECLARED_TIMEZONE 1
-_ACEOF
+$as_echo "#define HAVE_DECLARED_TIMEZONE 1" >>confdefs.h
 
   fi
 
 
-{ echo "$as_me:$LINENO: checking for type of reentrant time-related functions" >&5
-echo $ECHO_N "checking for type of reentrant time-related functions... $ECHO_C" >&6; }
-if test "${ac_cv_time_r_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for type of reentrant time-related functions" >&5
+$as_echo_n "checking for type of reentrant time-related functions... " >&6; }
+if test "${ac_cv_time_r_type+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
 
   ac_cv_time_r_type=POSIX
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <time.h>
@@ -27706,46 +19707,18 @@ return (1);
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_time_r_type=hpux
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
     ac_cv_time_r_type=POSIX
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <time.h>
@@ -27761,171 +19734,59 @@ main() {
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_time_r_type=irix
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     ac_cv_time_r_type=POSIX
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
-
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_time_r_type" >&5
-echo "${ECHO_T}$ac_cv_time_r_type" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_time_r_type" >&5
+$as_echo "$ac_cv_time_r_type" >&6; }
   case $ac_cv_time_r_type in
   hpux)
-cat >>confdefs.h <<\_ACEOF
-#define PHP_HPUX_TIME_R 1
-_ACEOF
+$as_echo "#define PHP_HPUX_TIME_R 1" >>confdefs.h
  ;;
   irix)
-cat >>confdefs.h <<\_ACEOF
-#define PHP_IRIX_TIME_R 1
-_ACEOF
+$as_echo "#define PHP_IRIX_TIME_R 1" >>confdefs.h
  ;;
   esac
 
 
-    { echo "$as_me:$LINENO: checking for readdir_r" >&5
-echo $ECHO_N "checking for readdir_r... $ECHO_C" >&6; }
-if test "${ac_cv_func_readdir_r+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define readdir_r to an innocuous variant, in case <limits.h> declares readdir_r.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define readdir_r innocuous_readdir_r
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char readdir_r (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef readdir_r
-
-/* 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 readdir_r ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_readdir_r || defined __stub___readdir_r
-choke me
-#endif
-
-int
-main ()
-{
-return readdir_r ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_readdir_r=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_readdir_r=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_readdir_r" >&5
-echo "${ECHO_T}$ac_cv_func_readdir_r" >&6; }
-if test $ac_cv_func_readdir_r = yes; then
+    ac_fn_c_check_func "$LINENO" "readdir_r" "ac_cv_func_readdir_r"
+if test "x$ac_cv_func_readdir_r" = x""yes; then :
   ac_cv_func_readdir_r=yes
 else
   ac_cv_func_readdir=no
 fi
 
   if test "$ac_cv_func_readdir_r" = "yes"; then
-  { echo "$as_me:$LINENO: checking for type of readdir_r" >&5
-echo $ECHO_N "checking for type of readdir_r... $ECHO_C" >&6; }
-if test "${ac_cv_what_readdir_r+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type of readdir_r" >&5
+$as_echo_n "checking for type of readdir_r... " >&6; }
+if test "${ac_cv_what_readdir_r+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
 
       ac_cv_what_readdir_r=none
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #define _REENTRANT
@@ -27950,41 +19811,13 @@ main() {
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
       ac_cv_what_readdir_r=POSIX
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #define _REENTRANT
@@ -27993,72 +19826,45 @@ cat >>conftest.$ac_ext <<_ACEOF
 int readdir_r(DIR *, struct dirent *);
 
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
 
           ac_cv_what_readdir_r=old-style
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
           ac_cv_what_readdir_r=none
 
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_what_readdir_r" >&5
-echo "${ECHO_T}$ac_cv_what_readdir_r" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_what_readdir_r" >&5
+$as_echo "$ac_cv_what_readdir_r" >&6; }
     case $ac_cv_what_readdir_r in
     POSIX)
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_POSIX_READDIR_R 1
-_ACEOF
+$as_echo "#define HAVE_POSIX_READDIR_R 1" >>confdefs.h
 ;;
     old-style)
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OLD_READDIR_R 1
-_ACEOF
+$as_echo "#define HAVE_OLD_READDIR_R 1" >>confdefs.h
 ;;
     esac
   fi
 
 
-{ echo "$as_me:$LINENO: checking for in_addr_t" >&5
-echo $ECHO_N "checking for in_addr_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_in_addr_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for in_addr_t" >&5
+$as_echo_n "checking for in_addr_t... " >&6; }
+if test "${ac_cv_type_in_addr_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -28070,114 +19876,29 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "in_addr_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  $EGREP "in_addr_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then :
   ac_cv_type_in_addr_t=yes
 else
   ac_cv_type_in_addr_t=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_in_addr_t" >&5
-echo "${ECHO_T}$ac_cv_type_in_addr_t" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_in_addr_t" >&5
+$as_echo "$ac_cv_type_in_addr_t" >&6; }
 if test $ac_cv_type_in_addr_t = no; then
 
-cat >>confdefs.h <<\_ACEOF
-#define in_addr_t u_int
-_ACEOF
+$as_echo "#define in_addr_t u_int" >>confdefs.h
 
 fi
 
 
-
 for ac_func in crypt_r
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+do :
+  ac_fn_c_check_func "$LINENO" "crypt_r" "ac_cv_func_crypt_r"
+if test "x$ac_cv_func_crypt_r" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_CRYPT_R 1
 _ACEOF
   php_crypt_r="1"
 else
@@ -28187,18 +19908,14 @@ done
 
 if test "x$php_crypt_r" = "x1"; then
 
-  { echo "$as_me:$LINENO: checking which data struct is used by crypt_r" >&5
-echo $ECHO_N "checking which data struct is used by crypt_r... $ECHO_C" >&6; }
-if test "${php_cv_crypt_r_style+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which data struct is used by crypt_r" >&5
+$as_echo_n "checking which data struct is used by crypt_r... " >&6; }
+if test "${php_cv_crypt_r_style+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
     php_cv_crypt_r_style=none
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #define _REENTRANT 1
@@ -28215,39 +19932,13 @@ crypt_r("passwd", "hash", &buffer);
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   php_cv_crypt_r_style=cryptd
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
     if test "$php_cv_crypt_r_style" = "none"; then
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #define _REENTRANT 1
@@ -28264,40 +19955,14 @@ crypt_r("passwd", "hash", &buffer);
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   php_cv_crypt_r_style=struct_crypt_data
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     fi
 
     if test "$php_cv_crypt_r_style" = "none"; then
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #define _REENTRANT 1
@@ -28315,77 +19980,47 @@ crypt_r("passwd", "hash", &buffer);
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   php_cv_crypt_r_style=struct_crypt_data_gnu_source
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     fi
 
 fi
-{ echo "$as_me:$LINENO: result: $php_cv_crypt_r_style" >&5
-echo "${ECHO_T}$php_cv_crypt_r_style" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_crypt_r_style" >&5
+$as_echo "$php_cv_crypt_r_style" >&6; }
 
   if test "$php_cv_crypt_r_style" = "cryptd"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define CRYPT_R_CRYPTD 1
-_ACEOF
+$as_echo "#define CRYPT_R_CRYPTD 1" >>confdefs.h
 
   fi
   if test "$php_cv_crypt_r_style" = "struct_crypt_data" -o "$php_cv_crypt_r_style" = "struct_crypt_data_gnu_source"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define CRYPT_R_STRUCT_CRYPT_DATA 1
-_ACEOF
+$as_echo "#define CRYPT_R_STRUCT_CRYPT_DATA 1" >>confdefs.h
 
   fi
   if test "$php_cv_crypt_r_style" = "struct_crypt_data_gnu_source"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define CRYPT_R_GNU_SOURCE 1
-_ACEOF
+$as_echo "#define CRYPT_R_GNU_SOURCE 1" >>confdefs.h
 
   fi
   if test "$php_cv_crypt_r_style" = "none"; then
-    { { echo "$as_me:$LINENO: error: Unable to detect data struct used by crypt_r" >&5
-echo "$as_me: error: Unable to detect data struct used by crypt_r" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Unable to detect data struct used by crypt_r" "$LINENO" 5
   fi
 
 fi
 
 
-  { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-  { echo "$as_me:$LINENO: result: ${T_MD}General settings${T_ME}" >&5
-echo "${ECHO_T}${T_MD}General settings${T_ME}" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}General settings${T_ME}" >&5
+$as_echo "${T_MD}General settings${T_ME}" >&6; }
 
 
 
 # Check whether --enable- was given.
-if test "${enable_+set}" = set; then
+if test "${enable_+set}" = set; then :
   enableval=$enable_;
 fi
 
@@ -28394,10 +20029,10 @@ fi
 
 php_enable_gcov=no
 
-{ echo "$as_me:$LINENO: checking whether to include gcov symbols" >&5
-echo $ECHO_N "checking whether to include gcov symbols... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include gcov symbols" >&5
+$as_echo_n "checking whether to include gcov symbols... " >&6; }
 # Check whether --enable-gcov was given.
-if test "${enable_gcov+set}" = set; then
+if test "${enable_gcov+set}" = set; then :
   enableval=$enable_gcov; PHP_GCOV=$enableval
 else
 
@@ -28408,8 +20043,8 @@ fi
 
 
 ext_output=$PHP_GCOV
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -28417,9 +20052,7 @@ echo "${ECHO_T}$ext_output" >&6; }
 if test "$PHP_GCOV" = "yes"; then
 
   if test "$GCC" != "yes"; then
-    { { echo "$as_me:$LINENO: error: GCC is required for --enable-gcov" >&5
-echo "$as_me: error: GCC is required for --enable-gcov" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "GCC is required for --enable-gcov" "$LINENO" 5
   fi
 
     case `$php_shtool path $CC` in
@@ -28428,19 +20061,17 @@ echo "$as_me: error: GCC is required for --enable-gcov" >&2;}
   esac
 
   if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then
-    { { echo "$as_me:$LINENO: error: ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1." >&5
-echo "$as_me: error: ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1." "$LINENO" 5
   fi
 
   ltp_version_list="1.5 1.6 1.7 1.9 1.10"
 
   # Extract the first word of "lcov", so it can be a program name with args.
 set dummy lcov; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_LTP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LTP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$LTP"; then
   ac_cv_prog_LTP="$LTP" # Let the user override the test.
@@ -28450,34 +20081,34 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LTP="lcov"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 LTP=$ac_cv_prog_LTP
 if test -n "$LTP"; then
-  { echo "$as_me:$LINENO: result: $LTP" >&5
-echo "${ECHO_T}$LTP" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LTP" >&5
+$as_echo "$LTP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   # Extract the first word of "genhtml", so it can be a program name with args.
 set dummy genhtml; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_LTP_GENHTML+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LTP_GENHTML+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$LTP_GENHTML"; then
   ac_cv_prog_LTP_GENHTML="$LTP_GENHTML" # Let the user override the test.
@@ -28487,25 +20118,25 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LTP_GENHTML="genhtml"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 LTP_GENHTML=$ac_cv_prog_LTP_GENHTML
 if test -n "$LTP_GENHTML"; then
-  { echo "$as_me:$LINENO: result: $LTP_GENHTML" >&5
-echo "${ECHO_T}$LTP_GENHTML" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LTP_GENHTML" >&5
+$as_echo "$LTP_GENHTML" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -28517,10 +20148,10 @@ fi
 
 
   if test "$LTP"; then
-    { echo "$as_me:$LINENO: checking for ltp version" >&5
-echo $ECHO_N "checking for ltp version... $ECHO_C" >&6; }
-if test "${php_cv_ltp_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ltp version" >&5
+$as_echo_n "checking for ltp version... " >&6; }
+if test "${php_cv_ltp_version+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
       php_cv_ltp_version=invalid
@@ -28532,35 +20163,27 @@ else
       done
 
 fi
-{ echo "$as_me:$LINENO: result: $php_cv_ltp_version" >&5
-echo "${ECHO_T}$php_cv_ltp_version" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_ltp_version" >&5
+$as_echo "$php_cv_ltp_version" >&6; }
   else
     ltp_msg="To enable code coverage reporting you must have one of the following LTP versions installed: $ltp_version_list"
-    { { echo "$as_me:$LINENO: error: $ltp_msg" >&5
-echo "$as_me: error: $ltp_msg" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "$ltp_msg" "$LINENO" 5
   fi
 
   case $php_cv_ltp_version in
     ""|invalid)
       ltp_msg="You must have one of the following versions of LTP: $ltp_version_list (found: $ltp_version)."
-      { { echo "$as_me:$LINENO: error: $ltp_msg" >&5
-echo "$as_me: error: $ltp_msg" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "$ltp_msg" "$LINENO" 5
       LTP="exit 0;"
       ;;
   esac
 
   if test -z "$LTP_GENHTML"; then
-    { { echo "$as_me:$LINENO: error: Could not find genhtml from the LTP package" >&5
-echo "$as_me: error: Could not find genhtml from the LTP package" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Could not find genhtml from the LTP package" "$LINENO" 5
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GCOV 1
-_ACEOF
+$as_echo "#define HAVE_GCOV 1" >>confdefs.h
 
 
   src=$abs_srcdir/Makefile.gcov
@@ -28581,10 +20204,10 @@ fi
 
 php_enable_debug=no
 
-{ echo "$as_me:$LINENO: checking whether to include debugging symbols" >&5
-echo $ECHO_N "checking whether to include debugging symbols... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include debugging symbols" >&5
+$as_echo_n "checking whether to include debugging symbols... " >&6; }
 # Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then
+if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug; PHP_DEBUG=$enableval
 else
 
@@ -28595,8 +20218,8 @@ fi
 
 
 ext_output=$PHP_DEBUG
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -28629,11 +20252,11 @@ fi
 
 php_with_layout=PHP
 
-{ echo "$as_me:$LINENO: checking layout of installed files" >&5
-echo $ECHO_N "checking layout of installed files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking layout of installed files" >&5
+$as_echo_n "checking layout of installed files... " >&6; }
 
 # Check whether --with-layout was given.
-if test "${with_layout+set}" = set; then
+if test "${with_layout+set}" = set; then :
   withval=$with_layout; PHP_LAYOUT=$withval
 else
 
@@ -28644,8 +20267,8 @@ fi
 
 
 ext_output=$PHP_LAYOUT
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -28662,11 +20285,11 @@ esac
 
 php_with_config_file_path=DEFAULT
 
-{ echo "$as_me:$LINENO: checking path to configuration file" >&5
-echo $ECHO_N "checking path to configuration file... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking path to configuration file" >&5
+$as_echo_n "checking path to configuration file... " >&6; }
 
 # Check whether --with-config-file-path was given.
-if test "${with_config_file_path+set}" = set; then
+if test "${with_config_file_path+set}" = set; then :
   withval=$with_config_file_path; PHP_CONFIG_FILE_PATH=$withval
 else
 
@@ -28677,8 +20300,8 @@ fi
 
 
 ext_output=$PHP_CONFIG_FILE_PATH
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -28694,15 +20317,15 @@ if test "$PHP_CONFIG_FILE_PATH" = "DEFAULT"; then
   esac
 fi
 
-{ echo "$as_me:$LINENO: checking where to scan for configuration files" >&5
-echo $ECHO_N "checking where to scan for configuration files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to scan for configuration files" >&5
+$as_echo_n "checking where to scan for configuration files... " >&6; }
 
 php_with_config_file_scan_dir=DEFAULT
 
 
 
 # Check whether --with-config-file-scan-dir was given.
-if test "${with_config_file_scan_dir+set}" = set; then
+if test "${with_config_file_scan_dir+set}" = set; then :
   withval=$with_config_file_scan_dir; PHP_CONFIG_FILE_SCAN_DIR=$withval
 else
 
@@ -28720,18 +20343,18 @@ ext_output=$PHP_CONFIG_FILE_SCAN_DIR
 if test "$PHP_CONFIG_FILE_SCAN_DIR" = "DEFAULT"; then
   PHP_CONFIG_FILE_SCAN_DIR=
 fi
-{ echo "$as_me:$LINENO: result: $PHP_CONFIG_FILE_SCAN_DIR" >&5
-echo "${ECHO_T}$PHP_CONFIG_FILE_SCAN_DIR" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_CONFIG_FILE_SCAN_DIR" >&5
+$as_echo "$PHP_CONFIG_FILE_SCAN_DIR" >&6; }
 
 test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
 
 
 php_enable_sigchild=no
 
-{ echo "$as_me:$LINENO: checking whether to enable PHP's own SIGCHLD handler" >&5
-echo $ECHO_N "checking whether to enable PHP's own SIGCHLD handler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable PHP's own SIGCHLD handler" >&5
+$as_echo_n "checking whether to enable PHP's own SIGCHLD handler... " >&6; }
 # Check whether --enable-sigchild was given.
-if test "${enable_sigchild+set}" = set; then
+if test "${enable_sigchild+set}" = set; then :
   enableval=$enable_sigchild; PHP_SIGCHILD=$enableval
 else
 
@@ -28742,33 +20365,29 @@ fi
 
 
 ext_output=$PHP_SIGCHILD
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_SIGCHILD" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define PHP_SIGCHILD 1
-_ACEOF
+$as_echo "#define PHP_SIGCHILD 1" >>confdefs.h
 
 else
 
-cat >>confdefs.h <<\_ACEOF
-#define PHP_SIGCHILD 0
-_ACEOF
+$as_echo "#define PHP_SIGCHILD 0" >>confdefs.h
 
 fi
 
 
 php_enable_libgcc=no
 
-{ echo "$as_me:$LINENO: checking whether to explicitly link against libgcc" >&5
-echo $ECHO_N "checking whether to explicitly link against libgcc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to explicitly link against libgcc" >&5
+$as_echo_n "checking whether to explicitly link against libgcc... " >&6; }
 # Check whether --enable-libgcc was given.
-if test "${enable_libgcc+set}" = set; then
+if test "${enable_libgcc+set}" = set; then :
   enableval=$enable_libgcc; PHP_LIBGCC=$enableval
 else
 
@@ -28779,8 +20398,8 @@ fi
 
 
 ext_output=$PHP_LIBGCC
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -28792,9 +20411,7 @@ if test "$PHP_LIBGCC" = "yes"; then
 
 
   if test -z "$libgcc_libpath"; then
-    { { echo "$as_me:$LINENO: error: Cannot locate libgcc. Make sure that gcc is in your path" >&5
-echo "$as_me: error: Cannot locate libgcc. Make sure that gcc is in your path" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Cannot locate libgcc. Make sure that gcc is in your path" "$LINENO" 5
   fi
 
   if test "$libgcc_libpath" != "/usr/$PHP_LIBDIR" && test "$libgcc_libpath" != "/usr/lib"; then
@@ -28803,10 +20420,10 @@ echo "$as_me: error: Cannot locate libgcc. Make sure that gcc is in your path" >
     ai_p=$libgcc_libpath
   else
 
-    ep_dir="`echo $libgcc_libpath|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $libgcc_libpath|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$libgcc_libpath\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$libgcc_libpath"`
   fi
 
 
@@ -28844,10 +20461,10 @@ fi
 
 php_enable_short_tags=yes
 
-{ echo "$as_me:$LINENO: checking whether to enable short tags by default" >&5
-echo $ECHO_N "checking whether to enable short tags by default... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable short tags by default" >&5
+$as_echo_n "checking whether to enable short tags by default... " >&6; }
 # Check whether --enable-short-tags was given.
-if test "${enable_short_tags+set}" = set; then
+if test "${enable_short_tags+set}" = set; then :
   enableval=$enable_short_tags; PHP_SHORT_TAGS=$enableval
 else
 
@@ -28858,33 +20475,29 @@ fi
 
 
 ext_output=$PHP_SHORT_TAGS
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_SHORT_TAGS" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define DEFAULT_SHORT_OPEN_TAG "1"
-_ACEOF
+$as_echo "#define DEFAULT_SHORT_OPEN_TAG \"1\"" >>confdefs.h
 
 else
 
-cat >>confdefs.h <<\_ACEOF
-#define DEFAULT_SHORT_OPEN_TAG "0"
-_ACEOF
+$as_echo "#define DEFAULT_SHORT_OPEN_TAG \"0\"" >>confdefs.h
 
 fi
 
 
 php_enable_dmalloc=no
 
-{ echo "$as_me:$LINENO: checking whether to enable dmalloc" >&5
-echo $ECHO_N "checking whether to enable dmalloc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dmalloc" >&5
+$as_echo_n "checking whether to enable dmalloc... " >&6; }
 # Check whether --enable-dmalloc was given.
-if test "${enable_dmalloc+set}" = set; then
+if test "${enable_dmalloc+set}" = set; then :
   enableval=$enable_dmalloc; PHP_DMALLOC=$enableval
 else
 
@@ -28895,25 +20508,21 @@ fi
 
 
 ext_output=$PHP_DMALLOC
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_DMALLOC" = "yes"; then
-  { echo "$as_me:$LINENO: checking for dmalloc_error in -ldmalloc" >&5
-echo $ECHO_N "checking for dmalloc_error in -ldmalloc... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dmalloc_dmalloc_error+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dmalloc_error in -ldmalloc" >&5
+$as_echo_n "checking for dmalloc_error in -ldmalloc... " >&6; }
+if test "${ac_cv_lib_dmalloc_dmalloc_error+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -28931,39 +20540,18 @@ return dmalloc_error ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dmalloc_dmalloc_error=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dmalloc_dmalloc_error=no
+  ac_cv_lib_dmalloc_dmalloc_error=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dmalloc_dmalloc_error" >&5
-echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_error" >&6; }
-if test $ac_cv_lib_dmalloc_dmalloc_error = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dmalloc_dmalloc_error" >&5
+$as_echo "$ac_cv_lib_dmalloc_dmalloc_error" >&6; }
+if test "x$ac_cv_lib_dmalloc_dmalloc_error" = x""yes; then :
 
 
 
@@ -28976,17 +20564,13 @@ if test $ac_cv_lib_dmalloc_dmalloc_error = yes; then
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DMALLOC 1
-_ACEOF
+$as_echo "#define HAVE_DMALLOC 1" >>confdefs.h
 
     CPPFLAGS="$CPPFLAGS -DDMALLOC_FUNC_CHECK"
 
 else
 
-    { { echo "$as_me:$LINENO: error: Problem with enabling dmalloc. Please check config.log for details." >&5
-echo "$as_me: error: Problem with enabling dmalloc. Please check config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Problem with enabling dmalloc. Please check config.log for details." "$LINENO" 5
 
 fi
 
@@ -28995,10 +20579,10 @@ fi
 
 php_enable_ipv6=yes
 
-{ echo "$as_me:$LINENO: checking whether to enable IPv6 support" >&5
-echo $ECHO_N "checking whether to enable IPv6 support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable IPv6 support" >&5
+$as_echo_n "checking whether to enable IPv6 support... " >&6; }
 # Check whether --enable-ipv6 was given.
-if test "${enable_ipv6+set}" = set; then
+if test "${enable_ipv6+set}" = set; then :
   enableval=$enable_ipv6; PHP_IPV6=$enableval
 else
 
@@ -29009,27 +20593,25 @@ fi
 
 
 ext_output=$PHP_IPV6
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_IPV6" != "no" && test "$ac_cv_ipv6_support" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IPV6 1
-_ACEOF
+$as_echo "#define HAVE_IPV6 1" >>confdefs.h
 
 fi
 
 
 php_enable_dtrace=no
 
-{ echo "$as_me:$LINENO: checking whether to enable DTrace support" >&5
-echo $ECHO_N "checking whether to enable DTrace support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable DTrace support" >&5
+$as_echo_n "checking whether to enable DTrace support... " >&6; }
 # Check whether --enable-dtrace was given.
-if test "${enable_dtrace+set}" = set; then
+if test "${enable_dtrace+set}" = set; then :
   enableval=$enable_dtrace; PHP_DTRACE=$enableval
 else
 
@@ -29040,147 +20622,19 @@ fi
 
 
 ext_output=$PHP_DTRACE
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_DTRACE" = "yes"; then
-
-for ac_header in sys/sdt.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  for ac_header in sys/sdt.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/sdt.h" "ac_cv_header_sys_sdt_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_sdt_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_SYS_SDT_H 1
 _ACEOF
 
 
@@ -29205,7 +20659,10 @@ _ACEOF
     PHP_LDFLAGS="$PHP_LDFLAGS -lelf"
     ;;
   *solaris*)
-    PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_provsrc.o"
+    PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_provsrc.lo"
+    ;;
+  *linux*)
+    PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_provsrc.lo"
     ;;
   esac
 
@@ -29234,20 +20691,53 @@ _ACEOF
 
   cat>>Makefile.objects<<EOF
 
+$abs_srcdir/$ac_provsrc:;
+
 $ac_bdir$ac_hdrobj: $abs_srcdir/$ac_provsrc
-	dtrace -h -C -s $ac_srcdir$ac_provsrc -o \$@ && \$(SED) -ibak 's,PHP_,DTRACE_,g' \$@
+	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir$ac_provsrc -o \$@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$@.bak > \$@
 
 \$(PHP_DTRACE_OBJS): $ac_bdir$ac_hdrobj
 
+EOF
+
+  case $host_alias in
+  *solaris*|*linux*)
+    dtrace_prov_name="`echo $ac_provsrc | $SED -e 's#\(.*\)\/##'`.o"
+    dtrace_lib_dir="`echo $ac_bdir$ac_provsrc | $SED -e 's#\(.*\)/[^/]*#\1#'`/.libs"
+    dtrace_d_obj="`echo $ac_bdir$ac_provsrc | $SED -e 's#\(.*\)/\([^/]*\)#\1/.libs/\2#'`.o"
+    dtrace_nolib_objs='$(PHP_DTRACE_OBJS:.lo=.o)'
+    for ac_lo in $PHP_DTRACE_OBJS; do
+      dtrace_lib_objs="$dtrace_lib_objs `echo $ac_lo | $SED -e 's,\.lo$,.o,' -e 's#\(.*\)\/#\1\/.libs\/#'`"
+    done;
+    cat>>Makefile.objects<<EOF
+$ac_bdir$ac_provsrc.lo: \$(PHP_DTRACE_OBJS)
+	echo "# Generated by Makefile for libtool" > \$@
+	@test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir
+	if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then \\
+	  echo "pic_object='.libs/$dtrace_prov_name'" >> \$@ ;\\
+	else \\
+	  echo "pic_object='none'" >> \$@ ;\\
+	fi
+	if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $ac_bdir$ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir$ac_provsrc.o"; then \\
+	  echo "non_pic_object='$dtrace_prov_name'" >> \$@ ;\\
+	else \\
+	  echo "non_pic_object='none'" >> \$@ ;\\
+	fi
+
+EOF
+
+    ;;
+  *)
+cat>>Makefile.objects<<EOF
 $ac_bdir$ac_provsrc.o: \$(PHP_DTRACE_OBJS)
-	dtrace -G -o \$@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
+	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
 
 EOF
+    ;;
+  esac
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DTRACE 1
-_ACEOF
+$as_echo "#define HAVE_DTRACE 1" >>confdefs.h
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_DTRACE_OBJS"
@@ -29255,9 +20745,7 @@ _ACEOF
 
 else
 
-    { { echo "$as_me:$LINENO: error: Cannot find sys/sdt.h which is required for DTrace support" >&5
-echo "$as_me: error: Cannot find sys/sdt.h which is required for DTrace support" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Cannot find sys/sdt.h which is required for DTrace support" "$LINENO" 5
 
 fi
 
@@ -29265,14 +20753,14 @@ done
 
 fi
 
-{ echo "$as_me:$LINENO: checking how big to make fd sets" >&5
-echo $ECHO_N "checking how big to make fd sets... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how big to make fd sets" >&5
+$as_echo_n "checking how big to make fd sets... " >&6; }
 
 php_enable_fd_setsize=no
 
 
 # Check whether --enable-fd-setsize was given.
-if test "${enable_fd_setsize+set}" = set; then
+if test "${enable_fd_setsize+set}" = set; then :
   enableval=$enable_fd_setsize; PHP_FD_SETSIZE=$enableval
 else
 
@@ -29291,37 +20779,35 @@ ext_output=$PHP_FD_SETSIZE
 if test "$PHP_FD_SETSIZE" != "no"; then
   if test "0$PHP_FD_SETSIZE" -gt 0 2>/dev/null; then
     CPPFLAGS="$CPPFLAGS -DFD_SETSIZE=$PHP_FD_SETSIZE"
-    { echo "$as_me:$LINENO: result: using $PHP_FD_SETSIZE" >&5
-echo "${ECHO_T}using $PHP_FD_SETSIZE" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using $PHP_FD_SETSIZE" >&5
+$as_echo "using $PHP_FD_SETSIZE" >&6; }
   else
-    { { echo "$as_me:$LINENO: error: Invalid value passed to --enable-fd-setsize!" >&5
-echo "$as_me: error: Invalid value passed to --enable-fd-setsize!" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Invalid value passed to --enable-fd-setsize!" "$LINENO" 5
   fi
 else
-  { echo "$as_me:$LINENO: result: using system default" >&5
-echo "${ECHO_T}using system default" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: using system default" >&5
+$as_echo "using system default" >&6; }
 fi
 
 
 
 # Check whether --enable- was given.
-if test "${enable_+set}" = set; then
+if test "${enable_+set}" = set; then :
   enableval=$enable_;
 fi
 
 
 
 
-  { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-  { echo "$as_me:$LINENO: result: ${T_MD}Configuring extensions${T_ME}" >&5
-echo "${ECHO_T}${T_MD}Configuring extensions${T_ME}" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring extensions${T_ME}" >&5
+$as_echo "${T_MD}Configuring extensions${T_ME}" >&6; }
 
 
 
 # Check whether --enable-all was given.
-if test "${enable_all+set}" = set; then
+if test "${enable_all+set}" = set; then :
   enableval=$enable_all;
   PHP_ENABLE_ALL=$enableval
 
@@ -29333,403 +20819,32 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6; }
-
 # 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.
-{ echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if test "${ac_cv_sizeof_long+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
 
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long=$ac_lo;;
-'') if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long=0
-   fi ;;
-esac
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_long=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$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; }
 
 
 
@@ -29738,403 +20853,32 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6; }
-if test "${ac_cv_type_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef int ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6; }
-
 # 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.
-{ echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
+if test "${ac_cv_sizeof_int+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
 
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_int=$ac_lo;;
-'') if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_int=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (int)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_int=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$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; }
 
 
 
@@ -30144,17 +20888,13 @@ _ACEOF
 
 
 
-{ echo "$as_me:$LINENO: checking for int32_t" >&5
-echo $ECHO_N "checking for int32_t... $ECHO_C" >&6; }
-if test "${ac_cv_int_type_int32_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for int32_t" >&5
+$as_echo_n "checking for int32_t... " >&6; }
+if test "${ac_cv_int_type_int32_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #if HAVE_SYS_TYPES_H
@@ -30177,56 +20917,30 @@ if (sizeof (int32_t))
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_int_type_int32_t=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_int_type_int32_t=no
+  ac_cv_int_type_int32_t=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_int_type_int32_t" >&5
-echo "${ECHO_T}$ac_cv_int_type_int32_t" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_int_type_int32_t" >&5
+$as_echo "$ac_cv_int_type_int32_t" >&6; }
 if test "$ac_cv_int_type_int32_t" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_INT32_T 1
-_ACEOF
+$as_echo "#define HAVE_INT32_T 1" >>confdefs.h
 
 fi
 
 
-{ echo "$as_me:$LINENO: checking for uint32_t" >&5
-echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6; }
-if test "${ac_cv_int_type_uint32_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint32_t" >&5
+$as_echo_n "checking for uint32_t... " >&6; }
+if test "${ac_cv_int_type_uint32_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #if HAVE_SYS_TYPES_H
@@ -30249,50 +20963,23 @@ if (sizeof (uint32_t))
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_int_type_uint32_t=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_int_type_uint32_t=no
+  ac_cv_int_type_uint32_t=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_int_type_uint32_t" >&5
-echo "${ECHO_T}$ac_cv_int_type_uint32_t" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_int_type_uint32_t" >&5
+$as_echo "$ac_cv_int_type_uint32_t" >&6; }
 if test "$ac_cv_int_type_uint32_t" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UINT32_T 1
-_ACEOF
+$as_echo "#define HAVE_UINT32_T 1" >>confdefs.h
 
 fi
 
 
-
-
-
-
-
 for ac_header in  \
 sys/types.h \
 inttypes.h \
@@ -30300,138 +20987,13 @@ stdint.h \
 string.h \
 stdlib.h
 
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+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"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -30439,97 +21001,14 @@ fi
 done
 
 
-
-
-
 for ac_func in strtoll atoll strftime
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+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"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -30848,10 +21327,10 @@ EOF
     ai_p=$ext_builddir/lib
   else
 
-    ep_dir="`echo $ext_builddir/lib|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ext_builddir/lib|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ext_builddir/lib\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ext_builddir/lib"`
   fi
 
 
@@ -30879,10 +21358,10 @@ EOF
     ai_p=$ext_srcdir/lib
   else
 
-    ep_dir="`echo $ext_srcdir/lib|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ext_srcdir/lib|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ext_srcdir/lib\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ext_srcdir/lib"`
   fi
 
 
@@ -30940,7 +21419,7 @@ php_with_regex=php
 
 
 # Check whether --with-regex was given.
-if test "${with_regex+set}" = set; then
+if test "${with_regex+set}" = set; then :
   withval=$with_regex; PHP_REGEX=$withval
 else
 
@@ -30969,15 +21448,15 @@ case $PHP_REGEX in
     ;;
   *)
     REGEX_TYPE=php
-    { echo "$as_me:$LINENO: WARNING: Invalid regex library type selected. Using default value: php" >&5
-echo "$as_me: WARNING: Invalid regex library type selected. Using default value: php" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Invalid regex library type selected. Using default value: php" >&5
+$as_echo "$as_me: WARNING: Invalid regex library type selected. Using default value: php" >&2;}
     ;;
 esac
 
-{ echo "$as_me:$LINENO: checking which regex library to use" >&5
-echo $ECHO_N "checking which regex library to use... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $REGEX_TYPE" >&5
-echo "${ECHO_T}$REGEX_TYPE" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which regex library to use" >&5
+$as_echo_n "checking which regex library to use... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $REGEX_TYPE" >&5
+$as_echo "$REGEX_TYPE" >&6; }
 
 if test "$REGEX_TYPE" = "php"; then
   ereg_regex_sources="regex/regcomp.c regex/regexec.c regex/regerror.c regex/regfree.c"
@@ -31301,19 +21780,13 @@ EOF
 
 if test "$REGEX_TYPE" = "php"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_REGEX_T_RE_MAGIC 1
-_ACEOF
+$as_echo "#define HAVE_REGEX_T_RE_MAGIC 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HSREGEX 1
-_ACEOF
+$as_echo "#define HSREGEX 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define REGEX 1
-_ACEOF
+$as_echo "#define REGEX 1" >>confdefs.h
 
 
 
@@ -31327,10 +21800,10 @@ _ACEOF
     ai_p=$ext_srcdir/regex
   else
 
-    ep_dir="`echo $ext_srcdir/regex|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ext_srcdir/regex|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ext_srcdir/regex\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ext_srcdir/regex"`
   fi
 
 
@@ -31353,21 +21826,15 @@ _ACEOF
 
 elif test "$REGEX_TYPE" = "system"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define REGEX 0
-_ACEOF
+$as_echo "#define REGEX 0" >>confdefs.h
 
-    { echo "$as_me:$LINENO: checking whether field re_magic exists in struct regex_t" >&5
-echo $ECHO_N "checking whether field re_magic exists in struct regex_t... $ECHO_C" >&6; }
-if test "${ac_cv_regex_t_re_magic+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether field re_magic exists in struct regex_t" >&5
+$as_echo_n "checking whether field re_magic exists in struct regex_t... " >&6; }
+if test "${ac_cv_regex_t_re_magic+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <regex.h>
@@ -31379,40 +21846,18 @@ regex_t rt; rt.re_magic;
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_regex_t_re_magic=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_regex_t_re_magic=no
+  ac_cv_regex_t_re_magic=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_regex_t_re_magic" >&5
-echo "${ECHO_T}$ac_cv_regex_t_re_magic" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_regex_t_re_magic" >&5
+$as_echo "$ac_cv_regex_t_re_magic" >&6; }
   if test "$ac_cv_regex_t_re_magic" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_REGEX_T_RE_MAGIC
-_ACEOF
+$as_echo "#define HAVE_REGEX_T_RE_MAGIC  " >>confdefs.h
 
   fi
 fi
@@ -31421,10 +21866,10 @@ fi
 
 php_enable_libxml=yes
 
-{ echo "$as_me:$LINENO: checking whether to enable LIBXML support" >&5
-echo $ECHO_N "checking whether to enable LIBXML support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable LIBXML support" >&5
+$as_echo_n "checking whether to enable LIBXML support... " >&6; }
 # Check whether --enable-libxml was given.
-if test "${enable_libxml+set}" = set; then
+if test "${enable_libxml+set}" = set; then :
   enableval=$enable_libxml; PHP_LIBXML=$enableval
 else
 
@@ -31456,8 +21901,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -31466,11 +21911,11 @@ if test -z "$PHP_LIBXML_DIR"; then
 
 php_with_libxml_dir=no
 
-{ echo "$as_me:$LINENO: checking libxml2 install dir" >&5
-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml2 install dir" >&5
+$as_echo_n "checking libxml2 install dir... " >&6; }
 
 # Check whether --with-libxml-dir was given.
-if test "${with_libxml_dir+set}" = set; then
+if test "${with_libxml_dir+set}" = set; then :
   withval=$with_libxml_dir; PHP_LIBXML_DIR=$withval
 else
 
@@ -31481,8 +21926,8 @@ fi
 
 
 ext_output=$PHP_LIBXML_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -31493,10 +21938,10 @@ if test "$PHP_LIBXML" != "no"; then
     ext_shared=no
 
 
-{ echo "$as_me:$LINENO: checking for xml2-config path" >&5
-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6; }
-if test "${ac_cv_php_xml2_config_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5
+$as_echo_n "checking for xml2-config path... " >&6; }
+if test "${ac_cv_php_xml2_config_path+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
   for i in $PHP_LIBXML_DIR /usr/local /usr; do
@@ -31507,8 +21952,8 @@ else
   done
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5
-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_xml2_config_path" >&5
+$as_echo "$ac_cv_php_xml2_config_path" >&6; }
 
   if test -x "$ac_cv_php_xml2_config_path"; then
     XML2_CONFIG="$ac_cv_php_xml2_config_path"
@@ -31575,10 +22020,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -31622,10 +22067,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -31651,10 +22096,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
   done
 
 
-            { echo "$as_me:$LINENO: checking whether libxml build works" >&5
-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6; }
-if test "${php_cv_libxml_build_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5
+$as_echo_n "checking whether libxml build works... " >&6; }
+if test "${php_cv_libxml_build_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -31662,16 +22107,12 @@ else
   LIBS="
           $LIBXML_SHARED_LIBADD
          $LIBS"
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
     LIBS=$old_LIBS
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -31682,26 +22123,7 @@ cat >>conftest.$ac_ext <<_ACEOF
     }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     LIBS=$old_LIBS
 
@@ -31709,43 +22131,32 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     LIBS=$old_LIBS
 
-          { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-          { { echo "$as_me:$LINENO: error: build test failed.  Please check the config.log for details." >&5
-echo "$as_me: error: build test failed.  Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          as_fn_error "build test failed.  Please check the config.log for details." "$LINENO" 5
 
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
 
-
 fi
-{ echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5
-echo "${ECHO_T}$php_cv_libxml_build_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_libxml_build_works" >&5
+$as_echo "$php_cv_libxml_build_works" >&6; }
       if test "$php_cv_libxml_build_works" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBXML 1
-_ACEOF
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
       fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBXML 1
-_ACEOF
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
 
   ext_builddir=ext/libxml
@@ -32060,14 +22471,10 @@ EOF
 
 
     else
-      { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5
-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "libxml2 version 2.6.11 or greater required." "$LINENO" 5
     fi
 else
-    { { echo "$as_me:$LINENO: error: xml2-config not found. Please check your libxml2 installation." >&5
-echo "$as_me: error: xml2-config not found. Please check your libxml2 installation." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5
 
   fi
 
@@ -32077,11 +22484,11 @@ fi
 
 php_with_openssl=no
 
-{ echo "$as_me:$LINENO: checking for OpenSSL support" >&5
-echo $ECHO_N "checking for OpenSSL support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL support" >&5
+$as_echo_n "checking for OpenSSL support... " >&6; }
 
 # Check whether --with-openssl was given.
-if test "${with_openssl+set}" = set; then
+if test "${with_openssl+set}" = set; then :
   withval=$with_openssl; PHP_OPENSSL=$withval
 else
 
@@ -32113,8 +22520,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -32122,11 +22529,11 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_with_kerberos=no
 
-{ echo "$as_me:$LINENO: checking for Kerberos support" >&5
-echo $ECHO_N "checking for Kerberos support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Kerberos support" >&5
+$as_echo_n "checking for Kerberos support... " >&6; }
 
 # Check whether --with-kerberos was given.
-if test "${with_kerberos+set}" = set; then
+if test "${with_kerberos+set}" = set; then :
   withval=$with_kerberos; PHP_KERBEROS=$withval
 else
 
@@ -32137,8 +22544,8 @@ fi
 
 
 ext_output=$PHP_KERBEROS
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -32450,10 +22857,10 @@ EOF
     if test -z "$KRB5_CONFIG"; then
     # Extract the first word of "krb5-config", so it can be a program name with args.
 set dummy krb5-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_KRB5_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_KRB5_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $KRB5_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -32466,14 +22873,14 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_KRB5_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_KRB5_CONFIG" && ac_cv_path_KRB5_CONFIG="no"
@@ -32482,11 +22889,11 @@ esac
 fi
 KRB5_CONFIG=$ac_cv_path_KRB5_CONFIG
 if test -n "$KRB5_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $KRB5_CONFIG" >&5
-echo "${ECHO_T}$KRB5_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KRB5_CONFIG" >&5
+$as_echo "$KRB5_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -32552,10 +22959,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -32599,10 +23006,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -32652,10 +23059,10 @@ fi
     ai_p=$PHP_KERBEROS_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $PHP_KERBEROS_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_KERBEROS_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_KERBEROS_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_KERBEROS_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -32782,10 +23189,10 @@ fi
     ai_p=$PHP_KERBEROS_DIR/include
   else
 
-    ep_dir="`echo $PHP_KERBEROS_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_KERBEROS_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_KERBEROS_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_KERBEROS_DIR/include"`
   fi
 
 
@@ -32816,18 +23223,14 @@ fi
 
   fi
 
-  { echo "$as_me:$LINENO: checking for DSA_get_default_method in -lssl" >&5
-echo $ECHO_N "checking for DSA_get_default_method in -lssl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_ssl_DSA_get_default_method+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DSA_get_default_method in -lssl" >&5
+$as_echo_n "checking for DSA_get_default_method in -lssl... " >&6; }
+if test "${ac_cv_lib_ssl_DSA_get_default_method+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lssl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -32845,58 +23248,31 @@ return DSA_get_default_method ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ssl_DSA_get_default_method=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_ssl_DSA_get_default_method=no
+  ac_cv_lib_ssl_DSA_get_default_method=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_DSA_get_default_method" >&5
-echo "${ECHO_T}$ac_cv_lib_ssl_DSA_get_default_method" >&6; }
-if test $ac_cv_lib_ssl_DSA_get_default_method = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_DSA_get_default_method" >&5
+$as_echo "$ac_cv_lib_ssl_DSA_get_default_method" >&6; }
+if test "x$ac_cv_lib_ssl_DSA_get_default_method" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DSA_DEFAULT_METHOD 1
-_ACEOF
+$as_echo "#define HAVE_DSA_DEFAULT_METHOD 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for X509_free in -lcrypto" >&5
-echo $ECHO_N "checking for X509_free in -lcrypto... $ECHO_C" >&6; }
-if test "${ac_cv_lib_crypto_X509_free+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X509_free in -lcrypto" >&5
+$as_echo_n "checking for X509_free in -lcrypto... " >&6; }
+if test "${ac_cv_lib_crypto_X509_free+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypto  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -32914,43 +23290,20 @@ return X509_free ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_crypto_X509_free=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_crypto_X509_free=no
+  ac_cv_lib_crypto_X509_free=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_X509_free" >&5
-echo "${ECHO_T}$ac_cv_lib_crypto_X509_free" >&6; }
-if test $ac_cv_lib_crypto_X509_free = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_X509_free" >&5
+$as_echo "$ac_cv_lib_crypto_X509_free" >&6; }
+if test "x$ac_cv_lib_crypto_X509_free" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DSA_DEFAULT_METHOD 1
-_ACEOF
+$as_echo "#define HAVE_DSA_DEFAULT_METHOD 1" >>confdefs.h
 
 fi
 
@@ -32972,10 +23325,10 @@ fi
     if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -32987,14 +23340,14 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
@@ -33003,11 +23356,11 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -33020,9 +23373,7 @@ fi
       OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl`
       OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl`
     else
-      { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5
-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "OpenSSL version 0.9.6 or greater required." "$LINENO" 5
     fi
 
     if test -n "$OPENSSL_LIBS"; then
@@ -33080,10 +23431,10 @@ echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -33129,10 +23480,10 @@ echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -33177,26 +23528,18 @@ echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
     done
 
     if test -z "$OPENSSL_INCDIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's <evp.h>" >&5
-echo "$as_me: error: Cannot find OpenSSL's <evp.h>" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Cannot find OpenSSL's <evp.h>" "$LINENO" 5
     fi
 
     if test -z "$OPENSSL_LIBDIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's libraries" >&5
-echo "$as_me: error: Cannot find OpenSSL's libraries" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Cannot find OpenSSL's libraries" "$LINENO" 5
     fi
 
     old_CPPFLAGS=$CPPFLAGS
     CPPFLAGS=-I$OPENSSL_INCDIR
-    { echo "$as_me:$LINENO: checking for OpenSSL version" >&5
-echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6; }
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL version" >&5
+$as_echo_n "checking for OpenSSL version... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <openssl/opensslv.h>
@@ -33206,19 +23549,17 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
+  $EGREP "yes" >/dev/null 2>&1; then :
 
-      { echo "$as_me:$LINENO: result: >= 0.9.6" >&5
-echo "${ECHO_T}>= 0.9.6" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: >= 0.9.6" >&5
+$as_echo ">= 0.9.6" >&6; }
 
 else
 
-      { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5
-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "OpenSSL version 0.9.6 or greater required." "$LINENO" 5
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
     CPPFLAGS=$old_CPPFLAGS
 
@@ -33229,10 +23570,10 @@ rm -f -r conftest*
     ai_p=$OPENSSL_INCDIR
   else
 
-    ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$OPENSSL_INCDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$OPENSSL_INCDIR"`
   fi
 
 
@@ -33316,10 +23657,10 @@ rm -f -r conftest*
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -33351,18 +23692,14 @@ rm -f -r conftest*
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for CRYPTO_free in -lcrypto" >&5
-echo $ECHO_N "checking for CRYPTO_free in -lcrypto... $ECHO_C" >&6; }
-if test "${ac_cv_lib_crypto_CRYPTO_free+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CRYPTO_free in -lcrypto" >&5
+$as_echo_n "checking for CRYPTO_free in -lcrypto... " >&6; }
+if test "${ac_cv_lib_crypto_CRYPTO_free+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypto  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -33380,39 +23717,18 @@ return CRYPTO_free ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_crypto_CRYPTO_free=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_crypto_CRYPTO_free=no
+  ac_cv_lib_crypto_CRYPTO_free=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_free" >&5
-echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_free" >&6; }
-if test $ac_cv_lib_crypto_CRYPTO_free = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_CRYPTO_free" >&5
+$as_echo "$ac_cv_lib_crypto_CRYPTO_free" >&6; }
+if test "x$ac_cv_lib_crypto_CRYPTO_free" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -33448,9 +23764,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_crypto_CRYPTO_free
 
-      { { echo "$as_me:$LINENO: error: libcrypto not found!" >&5
-echo "$as_me: error: libcrypto not found!" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "libcrypto not found!" "$LINENO" 5
 
 
 fi
@@ -33520,10 +23834,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -33555,18 +23869,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for SSL_CTX_set_ssl_version in -lssl" >&5
-echo $ECHO_N "checking for SSL_CTX_set_ssl_version in -lssl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_set_ssl_version in -lssl" >&5
+$as_echo_n "checking for SSL_CTX_set_ssl_version in -lssl... " >&6; }
+if test "${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lssl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -33584,39 +23894,18 @@ return SSL_CTX_set_ssl_version ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ssl_SSL_CTX_set_ssl_version=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_ssl_SSL_CTX_set_ssl_version=no
+  ac_cv_lib_ssl_SSL_CTX_set_ssl_version=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&5
-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&6; }
-if test $ac_cv_lib_ssl_SSL_CTX_set_ssl_version = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&5
+$as_echo "$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&6; }
+if test "x$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -33630,9 +23919,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version
 
-      { { echo "$as_me:$LINENO: error: libssl not found!" >&5
-echo "$as_me: error: libssl not found!" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "libssl not found!" "$LINENO" 5
 
 
 fi
@@ -33692,10 +23979,10 @@ fi
     ai_p=$OPENSSL_LIBDIR
   else
 
-    ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$OPENSSL_LIBDIR"`
   fi
 
 
@@ -33731,15 +24018,11 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OPENSSL_EXT 1
-_ACEOF
+$as_echo "#define HAVE_OPENSSL_EXT 1" >>confdefs.h
 
 
 else
-    { { echo "$as_me:$LINENO: error: OpenSSL check failed. Please check config.log for more information." >&5
-echo "$as_me: error: OpenSSL check failed. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "OpenSSL check failed. Please check config.log for more information." "$LINENO" 5
 
   fi
 
@@ -33753,7 +24036,7 @@ php_with_pcre_regex=yes
 
 
 # Check whether --with-pcre-regex was given.
-if test "${with_pcre_regex+set}" = set; then
+if test "${with_pcre_regex+set}" = set; then :
   withval=$with_pcre_regex; PHP_PCRE_REGEX=$withval
 else
 
@@ -33770,33 +24053,29 @@ ext_output=$PHP_PCRE_REGEX
 
 
   if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then
-    { echo "$as_me:$LINENO: checking for PCRE headers location" >&5
-echo $ECHO_N "checking for PCRE headers location... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCRE headers location" >&5
+$as_echo_n "checking for PCRE headers location... " >&6; }
     for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include; do
       test -f $i/pcre.h && PCRE_INCDIR=$i
     done
 
     if test -z "$PCRE_INCDIR"; then
-      { { echo "$as_me:$LINENO: error: Could not find pcre.h in $PHP_PCRE_REGEX" >&5
-echo "$as_me: error: Could not find pcre.h in $PHP_PCRE_REGEX" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Could not find pcre.h in $PHP_PCRE_REGEX" "$LINENO" 5
     fi
-    { echo "$as_me:$LINENO: result: $PCRE_INCDIR" >&5
-echo "${ECHO_T}$PCRE_INCDIR" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCRE_INCDIR" >&5
+$as_echo "$PCRE_INCDIR" >&6; }
 
-    { echo "$as_me:$LINENO: checking for PCRE library location" >&5
-echo $ECHO_N "checking for PCRE library location... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCRE library location" >&5
+$as_echo_n "checking for PCRE library location... " >&6; }
     for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do
       test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j
     done
 
     if test -z "$PCRE_LIBDIR" ; then
-      { { echo "$as_me:$LINENO: error: Could not find libpcre.(a|$SHLIB_SUFFIX_NAME) in $PHP_PCRE_REGEX" >&5
-echo "$as_me: error: Could not find libpcre.(a|$SHLIB_SUFFIX_NAME) in $PHP_PCRE_REGEX" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Could not find libpcre.(a|$SHLIB_SUFFIX_NAME) in $PHP_PCRE_REGEX" "$LINENO" 5
     fi
-    { echo "$as_me:$LINENO: result: $PCRE_LIBDIR" >&5
-echo "${ECHO_T}$PCRE_LIBDIR" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PCRE_LIBDIR" >&5
+$as_echo "$PCRE_LIBDIR" >&6; }
 
 
     pcre_major=`grep PCRE_MAJOR $PCRE_INCDIR/pcre.h | sed -e 's/[^0-9]//g'`
@@ -33808,9 +24087,7 @@ echo "${ECHO_T}$PCRE_LIBDIR" >&6; }
     fi
     pcre_version=$pcre_major$pcre_minor
     if test "$pcre_version" -lt 660; then
-      { { echo "$as_me:$LINENO: error: The PCRE extension requires PCRE library version >= 6.6" >&5
-echo "$as_me: error: The PCRE extension requires PCRE library version >= 6.6" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "The PCRE extension requires PCRE library version >= 6.6" "$LINENO" 5
     fi
 
 
@@ -33823,10 +24100,10 @@ echo "$as_me: error: The PCRE extension requires PCRE library version >= 6.6" >&
     ai_p=$PCRE_LIBDIR
   else
 
-    ep_dir="`echo $PCRE_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PCRE_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PCRE_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PCRE_LIBDIR"`
   fi
 
 
@@ -33864,9 +24141,7 @@ echo "$as_me: error: The PCRE extension requires PCRE library version >= 6.6" >&
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PCRE 1
-_ACEOF
+$as_echo "#define HAVE_PCRE 1" >>confdefs.h
 
 
   if test "$PCRE_INCDIR" != "/usr/include"; then
@@ -33875,10 +24150,10 @@ _ACEOF
     ai_p=$PCRE_INCDIR
   else
 
-    ep_dir="`echo $PCRE_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PCRE_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PCRE_INCDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PCRE_INCDIR"`
   fi
 
 
@@ -34213,10 +24488,10 @@ EOF
 
 
   else
-    { echo "$as_me:$LINENO: checking for PCRE library to use" >&5
-echo $ECHO_N "checking for PCRE library to use... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: bundled" >&5
-echo "${ECHO_T}bundled" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCRE library to use" >&5
+$as_echo_n "checking for PCRE library to use... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: bundled" >&5
+$as_echo "bundled" >&6; }
     pcrelib_sources="pcrelib/pcre_chartables.c pcrelib/pcre_ucd.c \
     				 pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_exec.c \
     				 pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c \
@@ -34544,9 +24819,7 @@ EOF
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BUNDLED_PCRE 1
-_ACEOF
+$as_echo "#define HAVE_BUNDLED_PCRE 1" >>confdefs.h
 
   fi
 
@@ -34554,11 +24827,11 @@ _ACEOF
 
 php_with_sqlite3=yes
 
-{ echo "$as_me:$LINENO: checking whether to enable the SQLite3 extension" >&5
-echo $ECHO_N "checking whether to enable the SQLite3 extension... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the SQLite3 extension" >&5
+$as_echo_n "checking whether to enable the SQLite3 extension... " >&6; }
 
 # Check whether --with-sqlite3 was given.
-if test "${with_sqlite3+set}" = set; then
+if test "${with_sqlite3+set}" = set; then :
   withval=$with_sqlite3; PHP_SQLITE3=$withval
 else
 
@@ -34590,8 +24863,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -34610,27 +24883,25 @@ if test $PHP_SQLITE3 != "no"; then
   fi
 
   if test $PHP_SQLITE3 != "yes"; then
-    { echo "$as_me:$LINENO: checking for sqlite3 files in default path" >&5
-echo $ECHO_N "checking for sqlite3 files in default path... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3 files in default path" >&5
+$as_echo_n "checking for sqlite3 files in default path... " >&6; }
     for i in $PHP_SQLITE3 /usr/local /usr; do
       if test -r $i/include/sqlite3.h; then
         SQLITE3_DIR=$i
-        { echo "$as_me:$LINENO: result: found in $i" >&5
-echo "${ECHO_T}found in $i" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $i" >&5
+$as_echo "found in $i" >&6; }
         break
       fi
     done
 
     if test -z "$SQLITE3_DIR"; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-      { { echo "$as_me:$LINENO: error: Please reinstall the sqlite distribution from http://www.sqlite.org" >&5
-echo "$as_me: error: Please reinstall the sqlite distribution from http://www.sqlite.org" >&2;}
-   { (exit 1); exit 1; }; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+      as_fn_error "Please reinstall the sqlite distribution from http://www.sqlite.org" "$LINENO" 5
     fi
 
-    { echo "$as_me:$LINENO: checking for SQLite 3.3.9+" >&5
-echo $ECHO_N "checking for SQLite 3.3.9+... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLite 3.3.9+" >&5
+$as_echo_n "checking for SQLite 3.3.9+... " >&6; }
 
   save_old_LDFLAGS=$LDFLAGS
   ac_stuff="
@@ -34693,10 +24964,10 @@ echo $ECHO_N "checking for SQLite 3.3.9+... $ECHO_C" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -34728,18 +24999,14 @@ echo $ECHO_N "checking for SQLite 3.3.9+... $ECHO_C" >&6; }
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for sqlite3_prepare_v2 in -lsqlite3" >&5
-echo $ECHO_N "checking for sqlite3_prepare_v2 in -lsqlite3... $ECHO_C" >&6; }
-if test "${ac_cv_lib_sqlite3_sqlite3_prepare_v2+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_prepare_v2 in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_prepare_v2 in -lsqlite3... " >&6; }
+if test "${ac_cv_lib_sqlite3_sqlite3_prepare_v2+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -34757,45 +25024,24 @@ return sqlite3_prepare_v2 ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sqlite3_sqlite3_prepare_v2=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_sqlite3_sqlite3_prepare_v2=no
+  ac_cv_lib_sqlite3_sqlite3_prepare_v2=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_prepare_v2" >&5
-echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_prepare_v2" >&6; }
-if test $ac_cv_lib_sqlite3_sqlite3_prepare_v2 = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_prepare_v2" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_prepare_v2" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_prepare_v2" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-      { echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
 
 
   if test "$ext_shared" = "yes"; then
@@ -34808,10 +25054,10 @@ echo "${ECHO_T}found" >&6; }
     ai_p=$SQLITE3_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $SQLITE3_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $SQLITE3_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$SQLITE3_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$SQLITE3_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -34851,10 +25097,10 @@ echo "${ECHO_T}found" >&6; }
     ai_p=$SQLITE3_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $SQLITE3_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $SQLITE3_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$SQLITE3_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$SQLITE3_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -34900,10 +25146,10 @@ echo "${ECHO_T}found" >&6; }
     ai_p=$SQLITE3_DIR/include
   else
 
-    ep_dir="`echo $SQLITE3_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $SQLITE3_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$SQLITE3_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$SQLITE3_DIR/include"`
   fi
 
 
@@ -34932,11 +25178,9 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sqlite3_sqlite3_prepare_v2
 
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-      { { echo "$as_me:$LINENO: error: Please install SQLite 3.3.9 first or check libsqlite3 is present" >&5
-echo "$as_me: error: Please install SQLite 3.3.9 first or check libsqlite3 is present" >&2;}
-   { (exit 1); exit 1; }; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+      as_fn_error "Please install SQLite 3.3.9 first or check libsqlite3 is present" "$LINENO" 5
 
 
 fi
@@ -35002,10 +25246,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -35037,18 +25281,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for sqlite3_key in -lsqlite3" >&5
-echo $ECHO_N "checking for sqlite3_key in -lsqlite3... $ECHO_C" >&6; }
-if test "${ac_cv_lib_sqlite3_sqlite3_key+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_key in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_key in -lsqlite3... " >&6; }
+if test "${ac_cv_lib_sqlite3_sqlite3_key+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -35066,47 +25306,24 @@ return sqlite3_key ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sqlite3_sqlite3_key=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_sqlite3_sqlite3_key=no
+  ac_cv_lib_sqlite3_sqlite3_key=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_key" >&5
-echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_key" >&6; }
-if test $ac_cv_lib_sqlite3_sqlite3_key = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_key" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_key" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_key" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SQLITE3_KEY 1
-_ACEOF
+$as_echo "#define HAVE_SQLITE3_KEY 1" >>confdefs.h
 
 
 
@@ -35179,10 +25396,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -35214,18 +25431,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for sqlite3_column_table_name in -lsqlite3" >&5
-echo $ECHO_N "checking for sqlite3_column_table_name in -lsqlite3... $ECHO_C" >&6; }
-if test "${ac_cv_lib_sqlite3_sqlite3_column_table_name+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_column_table_name in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_column_table_name in -lsqlite3... " >&6; }
+if test "${ac_cv_lib_sqlite3_sqlite3_column_table_name+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -35243,47 +25456,24 @@ return sqlite3_column_table_name ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sqlite3_sqlite3_column_table_name=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_sqlite3_sqlite3_column_table_name=no
+  ac_cv_lib_sqlite3_sqlite3_column_table_name=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_column_table_name" >&5
-echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_column_table_name" >&6; }
-if test $ac_cv_lib_sqlite3_sqlite3_column_table_name = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_column_table_name" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_column_table_name" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_column_table_name" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define SQLITE_ENABLE_COLUMN_METADATA 1
-_ACEOF
+$as_echo "#define SQLITE_ENABLE_COLUMN_METADATA 1" >>confdefs.h
 
 
 
@@ -35357,10 +25547,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -35392,18 +25582,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for sqlite3_load_extension in -lsqlite3" >&5
-echo $ECHO_N "checking for sqlite3_load_extension in -lsqlite3... $ECHO_C" >&6; }
-if test "${ac_cv_lib_sqlite3_sqlite3_load_extension+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_load_extension in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_load_extension in -lsqlite3... " >&6; }
+if test "${ac_cv_lib_sqlite3_sqlite3_load_extension+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -35421,39 +25607,18 @@ return sqlite3_load_extension ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sqlite3_sqlite3_load_extension=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_sqlite3_sqlite3_load_extension=no
+  ac_cv_lib_sqlite3_sqlite3_load_extension=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_load_extension" >&5
-echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_load_extension" >&6; }
-if test $ac_cv_lib_sqlite3_sqlite3_load_extension = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_load_extension" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_load_extension" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_load_extension" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -35465,9 +25630,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sqlite3_sqlite3_load_extension
 
-cat >>confdefs.h <<\_ACEOF
-#define SQLITE_OMIT_LOAD_EXTENSION 1
-_ACEOF
+$as_echo "#define SQLITE_OMIT_LOAD_EXTENSION 1" >>confdefs.h
 
 
 
@@ -35475,10 +25638,10 @@ fi
 
 
   else
-    { echo "$as_me:$LINENO: checking bundled sqlite3 library" >&5
-echo $ECHO_N "checking bundled sqlite3 library... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking bundled sqlite3 library" >&5
+$as_echo_n "checking bundled sqlite3 library... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
     sqlite3_extra_sources="libsqlite/sqlite3.c"
 
@@ -35520,9 +25683,7 @@ echo "${ECHO_T}yes" >&6; }
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SQLITE3 1
-_ACEOF
+$as_echo "#define HAVE_SQLITE3 1" >>confdefs.h
 
 
   sqlite3_sources="sqlite3.c $sqlite3_extra_sources"
@@ -35834,11 +25995,11 @@ fi
 
 php_with_zlib=no
 
-{ echo "$as_me:$LINENO: checking for ZLIB support" >&5
-echo $ECHO_N "checking for ZLIB support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZLIB support" >&5
+$as_echo_n "checking for ZLIB support... " >&6; }
 
 # Check whether --with-zlib was given.
-if test "${with_zlib+set}" = set; then
+if test "${with_zlib+set}" = set; then :
   withval=$with_zlib; PHP_ZLIB=$withval
 else
 
@@ -35870,8 +26031,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -35879,11 +26040,11 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_with_zlib_dir=no
 
-{ echo "$as_me:$LINENO: checking if the location of ZLIB install directory is defined" >&5
-echo $ECHO_N "checking if the location of ZLIB install directory is defined... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the location of ZLIB install directory is defined" >&5
+$as_echo_n "checking if the location of ZLIB install directory is defined... " >&6; }
 
 # Check whether --with-zlib-dir was given.
-if test "${with_zlib_dir+set}" = set; then
+if test "${with_zlib_dir+set}" = set; then :
   withval=$with_zlib_dir; PHP_ZLIB_DIR=$withval
 else
 
@@ -35894,8 +26055,8 @@ fi
 
 
 ext_output=$PHP_ZLIB_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -36219,9 +26380,7 @@ EOF
   fi
 
   if test -z "$ZLIB_DIR"; then
-    { { echo "$as_me:$LINENO: error: Cannot find libz" >&5
-echo "$as_me: error: Cannot find libz" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Cannot find libz" "$LINENO" 5
   fi
 
   case $ZLIB_DIR in
@@ -36229,15 +26388,13 @@ echo "$as_me: error: Cannot find libz" >&2;}
   *) ac_extra=-L$ZLIB_DIR/$PHP_LIBDIR ;;
   esac
 
-  { echo "$as_me:$LINENO: checking for zlib version >= 1.2.0.4" >&5
-echo $ECHO_N "checking for zlib version >= 1.2.0.4... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib version >= 1.2.0.4" >&5
+$as_echo_n "checking for zlib version >= 1.2.0.4... " >&6; }
   ZLIB_VERSION=`$EGREP "define ZLIB_VERSION" $ZLIB_DIR/include/zlib.h | $SED -e 's/[^0-9\.]//g'`
-  { echo "$as_me:$LINENO: result: $ZLIB_VERSION" >&5
-echo "${ECHO_T}$ZLIB_VERSION" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZLIB_VERSION" >&5
+$as_echo "$ZLIB_VERSION" >&6; }
   if test `echo $ZLIB_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*1000000 + $2*10000 + $3*100 + $4}'` -lt 1020004; then
-    { { echo "$as_me:$LINENO: error: libz version greater or equal to 1.2.0.4 required" >&5
-echo "$as_me: error: libz version greater or equal to 1.2.0.4 required" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "libz version greater or equal to 1.2.0.4 required" "$LINENO" 5
   fi
 
 
@@ -36302,10 +26459,10 @@ echo "$as_me: error: libz version greater or equal to 1.2.0.4 required" >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -36337,18 +26494,14 @@ echo "$as_me: error: libz version greater or equal to 1.2.0.4 required" >&2;}
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gzgets in -lz" >&5
-echo $ECHO_N "checking for gzgets in -lz... $ECHO_C" >&6; }
-if test "${ac_cv_lib_z_gzgets+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzgets in -lz" >&5
+$as_echo_n "checking for gzgets in -lz... " >&6; }
+if test "${ac_cv_lib_z_gzgets+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -36366,47 +26519,24 @@ return gzgets ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_z_gzgets=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_z_gzgets=no
+  ac_cv_lib_z_gzgets=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzgets" >&5
-echo "${ECHO_T}$ac_cv_lib_z_gzgets" >&6; }
-if test $ac_cv_lib_z_gzgets = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzgets" >&5
+$as_echo "$ac_cv_lib_z_gzgets" >&6; }
+if test "x$ac_cv_lib_z_gzgets" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ZLIB 1
-_ACEOF
+$as_echo "#define HAVE_ZLIB 1" >>confdefs.h
 
 
 
@@ -36416,9 +26546,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_z_gzgets
 
-    { { echo "$as_me:$LINENO: error: ZLIB extension requires gzgets in zlib" >&5
-echo "$as_me: error: ZLIB extension requires gzgets in zlib" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "ZLIB extension requires gzgets in zlib" "$LINENO" 5
 
 
 fi
@@ -36431,10 +26559,10 @@ fi
     ai_p=$ZLIB_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ZLIB_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ZLIB_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -36494,10 +26622,10 @@ fi
     ai_p=$ZLIB_INCDIR
   else
 
-    ep_dir="`echo $ZLIB_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ZLIB_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ZLIB_INCDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ZLIB_INCDIR"`
   fi
 
 
@@ -36525,10 +26653,10 @@ fi
 
 php_enable_bcmath=no
 
-{ echo "$as_me:$LINENO: checking whether to enable bc style precision math functions" >&5
-echo $ECHO_N "checking whether to enable bc style precision math functions... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable bc style precision math functions" >&5
+$as_echo_n "checking whether to enable bc style precision math functions... " >&6; }
 # Check whether --enable-bcmath was given.
-if test "${enable_bcmath+set}" = set; then
+if test "${enable_bcmath+set}" = set; then :
   enableval=$enable_bcmath; PHP_BCMATH=$enableval
 else
 
@@ -36560,8 +26688,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -36882,9 +27010,7 @@ EOF
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BCMATH 1
-_ACEOF
+$as_echo "#define HAVE_BCMATH 1" >>confdefs.h
 
 fi
 
@@ -36892,11 +27018,11 @@ fi
 
 php_with_bz2=no
 
-{ echo "$as_me:$LINENO: checking for BZip2 support" >&5
-echo $ECHO_N "checking for BZip2 support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZip2 support" >&5
+$as_echo_n "checking for BZip2 support... " >&6; }
 
 # Check whether --with-bz2 was given.
-if test "${with_bz2+set}" = set; then
+if test "${with_bz2+set}" = set; then :
   withval=$with_bz2; PHP_BZ2=$withval
 else
 
@@ -36928,8 +27054,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -36938,24 +27064,22 @@ if test "$PHP_BZ2" != "no"; then
   if test -r $PHP_BZ2/include/bzlib.h; then
     BZIP_DIR=$PHP_BZ2
   else
-    { echo "$as_me:$LINENO: checking for BZip2 in default path" >&5
-echo $ECHO_N "checking for BZip2 in default path... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZip2 in default path" >&5
+$as_echo_n "checking for BZip2 in default path... " >&6; }
     for i in /usr/local /usr; do
       if test -r $i/include/bzlib.h; then
         BZIP_DIR=$i
-        { echo "$as_me:$LINENO: result: found in $i" >&5
-echo "${ECHO_T}found in $i" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $i" >&5
+$as_echo "found in $i" >&6; }
         break
       fi
     done
   fi
 
   if test -z "$BZIP_DIR"; then
-    { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-    { { echo "$as_me:$LINENO: error: Please reinstall the BZip2 distribution" >&5
-echo "$as_me: error: Please reinstall the BZip2 distribution" >&2;}
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+    as_fn_error "Please reinstall the BZip2 distribution" "$LINENO" 5
   fi
 
 
@@ -37020,10 +27144,10 @@ echo "$as_me: error: Please reinstall the BZip2 distribution" >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -37055,18 +27179,14 @@ echo "$as_me: error: Please reinstall the BZip2 distribution" >&2;}
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for BZ2_bzerror in -lbz2" >&5
-echo $ECHO_N "checking for BZ2_bzerror in -lbz2... $ECHO_C" >&6; }
-if test "${ac_cv_lib_bz2_BZ2_bzerror+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzerror in -lbz2" >&5
+$as_echo_n "checking for BZ2_bzerror in -lbz2... " >&6; }
+if test "${ac_cv_lib_bz2_BZ2_bzerror+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbz2  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -37084,39 +27204,18 @@ return BZ2_bzerror ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bz2_BZ2_bzerror=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_bz2_BZ2_bzerror=no
+  ac_cv_lib_bz2_BZ2_bzerror=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bz2_BZ2_bzerror" >&5
-echo "${ECHO_T}$ac_cv_lib_bz2_BZ2_bzerror" >&6; }
-if test $ac_cv_lib_bz2_BZ2_bzerror = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzerror" >&5
+$as_echo "$ac_cv_lib_bz2_BZ2_bzerror" >&6; }
+if test "x$ac_cv_lib_bz2_BZ2_bzerror" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -37128,10 +27227,10 @@ if test $ac_cv_lib_bz2_BZ2_bzerror = yes; then
     ai_p=$BZIP_DIR/include
   else
 
-    ep_dir="`echo $BZIP_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $BZIP_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$BZIP_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$BZIP_DIR/include"`
   fi
 
 
@@ -37164,10 +27263,10 @@ if test $ac_cv_lib_bz2_BZ2_bzerror = yes; then
     ai_p=$BZIP_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$BZIP_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$BZIP_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -37207,10 +27306,10 @@ if test $ac_cv_lib_bz2_BZ2_bzerror = yes; then
     ai_p=$BZIP_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$BZIP_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$BZIP_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -37250,9 +27349,7 @@ if test $ac_cv_lib_bz2_BZ2_bzerror = yes; then
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BZ2 1
-_ACEOF
+$as_echo "#define HAVE_BZ2 1" >>confdefs.h
 
 
 
@@ -37262,9 +27359,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_bz2_BZ2_bzerror
 
-    { { echo "$as_me:$LINENO: error: bz2 module requires libbz2 >= 1.0.0" >&5
-echo "$as_me: error: bz2 module requires libbz2 >= 1.0.0" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "bz2 module requires libbz2 >= 1.0.0" "$LINENO" 5
 
 
 fi
@@ -37572,10 +27667,10 @@ fi
 
 php_enable_calendar=no
 
-{ echo "$as_me:$LINENO: checking whether to enable calendar conversion support" >&5
-echo $ECHO_N "checking whether to enable calendar conversion support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable calendar conversion support" >&5
+$as_echo_n "checking whether to enable calendar conversion support... " >&6; }
 # Check whether --enable-calendar was given.
-if test "${enable_calendar+set}" = set; then
+if test "${enable_calendar+set}" = set; then :
   enableval=$enable_calendar; PHP_CALENDAR=$enableval
 else
 
@@ -37607,17 +27702,15 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_CALENDAR" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CALENDAR 1
-_ACEOF
+$as_echo "#define HAVE_CALENDAR 1" >>confdefs.h
 
 
   ext_builddir=ext/calendar
@@ -37918,10 +28011,10 @@ fi
 
 php_enable_ctype=yes
 
-{ echo "$as_me:$LINENO: checking whether to enable ctype functions" >&5
-echo $ECHO_N "checking whether to enable ctype functions... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable ctype functions" >&5
+$as_echo_n "checking whether to enable ctype functions... " >&6; }
 # Check whether --enable-ctype was given.
-if test "${enable_ctype+set}" = set; then
+if test "${enable_ctype+set}" = set; then :
   enableval=$enable_ctype; PHP_CTYPE=$enableval
 else
 
@@ -37953,17 +28046,15 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_CTYPE" != "no"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CTYPE 1
-_ACEOF
+$as_echo "#define HAVE_CTYPE 1" >>confdefs.h
 
 
   ext_builddir=ext/ctype
@@ -38264,11 +28355,11 @@ fi
 
 php_with_curl=no
 
-{ echo "$as_me:$LINENO: checking for cURL support" >&5
-echo $ECHO_N "checking for cURL support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cURL support" >&5
+$as_echo_n "checking for cURL support... " >&6; }
 
 # Check whether --with-curl was given.
-if test "${with_curl+set}" = set; then
+if test "${with_curl+set}" = set; then :
   withval=$with_curl; PHP_CURL=$withval
 else
 
@@ -38300,8 +28391,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -38309,11 +28400,11 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_with_curlwrappers=no
 
-{ echo "$as_me:$LINENO: checking if we should use cURL for url streams" >&5
-echo $ECHO_N "checking if we should use cURL for url streams... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should use cURL for url streams" >&5
+$as_echo_n "checking if we should use cURL for url streams... " >&6; }
 
 # Check whether --with-curlwrappers was given.
-if test "${with_curlwrappers+set}" = set; then
+if test "${with_curlwrappers+set}" = set; then :
   withval=$with_curlwrappers; PHP_CURLWRAPPERS=$withval
 else
 
@@ -38324,8 +28415,8 @@ fi
 
 
 ext_output=$PHP_CURLWRAPPERS
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -38334,31 +28425,28 @@ if test "$PHP_CURL" != "no"; then
   if test -r $PHP_CURL/include/curl/easy.h; then
     CURL_DIR=$PHP_CURL
   else
-    { echo "$as_me:$LINENO: checking for cURL in default path" >&5
-echo $ECHO_N "checking for cURL in default path... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cURL in default path" >&5
+$as_echo_n "checking for cURL in default path... " >&6; }
     for i in /usr/local /usr; do
       if test -r $i/include/curl/easy.h; then
         CURL_DIR=$i
-        { echo "$as_me:$LINENO: result: found in $i" >&5
-echo "${ECHO_T}found in $i" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $i" >&5
+$as_echo "found in $i" >&6; }
         break
       fi
     done
   fi
 
   if test -z "$CURL_DIR"; then
-    { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-    { { echo "$as_me:$LINENO: error: Please reinstall the libcurl distribution -
-    easy.h should be in <curl-dir>/include/curl/" >&5
-echo "$as_me: error: Please reinstall the libcurl distribution -
-    easy.h should be in <curl-dir>/include/curl/" >&2;}
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+    as_fn_error "Please reinstall the libcurl distribution -
+    easy.h should be in <curl-dir>/include/curl/" "$LINENO" 5
   fi
 
   CURL_CONFIG="curl-config"
-  { echo "$as_me:$LINENO: checking for cURL 7.10.5 or greater" >&5
-echo $ECHO_N "checking for cURL 7.10.5 or greater... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cURL 7.10.5 or greater" >&5
+$as_echo_n "checking for cURL 7.10.5 or greater... " >&6; }
 
   if ${CURL_DIR}/bin/curl-config --libs > /dev/null 2>&1; then
     CURL_CONFIG=${CURL_DIR}/bin/curl-config
@@ -38371,13 +28459,11 @@ echo $ECHO_N "checking for cURL 7.10.5 or greater... $ECHO_C" >&6; }
   curl_version_full=`$CURL_CONFIG --version`
   curl_version=`echo ${curl_version_full} | sed -e 's/libcurl //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
   if test "$curl_version" -ge 7010005; then
-    { echo "$as_me:$LINENO: result: $curl_version_full" >&5
-echo "${ECHO_T}$curl_version_full" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $curl_version_full" >&5
+$as_echo "$curl_version_full" >&6; }
     CURL_LIBS=`$CURL_CONFIG --libs`
   else
-    { { echo "$as_me:$LINENO: error: cURL version 7.10.5 or later is required to compile php with cURL support" >&5
-echo "$as_me: error: cURL version 7.10.5 or later is required to compile php with cURL support" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "cURL version 7.10.5 or later is required to compile php with cURL support" "$LINENO" 5
   fi
 
 
@@ -38387,10 +28473,10 @@ echo "$as_me: error: cURL version 7.10.5 or later is required to compile php wit
     ai_p=$CURL_DIR/include
   else
 
-    ep_dir="`echo $CURL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $CURL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$CURL_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$CURL_DIR/include"`
   fi
 
 
@@ -38465,10 +28551,10 @@ echo "$as_me: error: cURL version 7.10.5 or later is required to compile php wit
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -38512,10 +28598,10 @@ echo "$as_me: error: cURL version 7.10.5 or later is required to compile php wit
     ai_p=$CURL_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$CURL_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -38555,10 +28641,10 @@ echo "$as_me: error: cURL version 7.10.5 or later is required to compile php wit
     ai_p=$CURL_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$CURL_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -38598,16 +28684,14 @@ echo "$as_me: error: cURL version 7.10.5 or later is required to compile php wit
 
 
 
-  { echo "$as_me:$LINENO: checking for SSL support in libcurl" >&5
-echo $ECHO_N "checking for SSL support in libcurl... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL support in libcurl" >&5
+$as_echo_n "checking for SSL support in libcurl... " >&6; }
   CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
   if test "$CURL_SSL" = "SSL"; then
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CURL_SSL 1
-_ACEOF
+$as_echo "#define HAVE_CURL_SSL 1" >>confdefs.h
 
 
     save_CFLAGS="$CFLAGS"
@@ -38618,15 +28702,15 @@ 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
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&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+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if test "${ac_cv_prog_CPP+set}" = set; 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"
@@ -38640,11 +28724,7 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -38653,76 +28733,34 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+if $ac_preproc_ok; then :
   break
 fi
 
@@ -38734,8 +28772,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$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
@@ -38745,11 +28783,7 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -38758,83 +28792,40 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+if $ac_preproc_ok; then :
+
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -38843,19 +28834,15 @@ 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
 
-    { echo "$as_me:$LINENO: checking for openssl support in libcurl" >&5
-echo $ECHO_N "checking for openssl support in libcurl... $ECHO_C" >&6; }
-    if test "$cross_compiling" = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl support in libcurl" >&5
+$as_echo_n "checking for openssl support in libcurl... " >&6; }
+    if test "$cross_compiling" = yes; then :
 
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <curl/curl.h>
@@ -38874,169 +28861,20 @@ int main(int argc, char *argv[])
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+if ac_fn_c_try_run "$LINENO"; then :
 
-for ac_header in openssl/crypto.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      for ac_header in openssl/crypto.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "openssl/crypto.h" "ac_cv_header_openssl_crypto_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_crypto_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_OPENSSL_CRYPTO_H 1
 _ACEOF
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CURL_OPENSSL 1
-_ACEOF
+$as_echo "#define HAVE_CURL_OPENSSL 1" >>confdefs.h
 
 
 fi
@@ -39045,34 +28883,25 @@ done
 
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls support in libcurl" >&5
+$as_echo_n "checking for gnutls support in libcurl... " >&6; }
+    if test "$cross_compiling" = yes; then :
 
-    { echo "$as_me:$LINENO: checking for gnutls support in libcurl" >&5
-echo $ECHO_N "checking for gnutls support in libcurl... $ECHO_C" >&6; }
-    if test "$cross_compiling" = yes; then
-
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <curl/curl.h>
@@ -39091,160 +28920,15 @@ int main(int argc, char *argv[])
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-      if test "${ac_cv_header_gcrypt_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for gcrypt.h" >&5
-echo $ECHO_N "checking for gcrypt.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_gcrypt_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_gcrypt_h" >&5
-echo "${ECHO_T}$ac_cv_header_gcrypt_h" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking gcrypt.h usability" >&5
-echo $ECHO_N "checking gcrypt.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <gcrypt.h>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking gcrypt.h presence" >&5
-echo $ECHO_N "checking gcrypt.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <gcrypt.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: gcrypt.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: gcrypt.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gcrypt.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: gcrypt.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: gcrypt.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: gcrypt.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gcrypt.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: gcrypt.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gcrypt.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: gcrypt.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gcrypt.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: gcrypt.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gcrypt.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: gcrypt.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gcrypt.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: gcrypt.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for gcrypt.h" >&5
-echo $ECHO_N "checking for gcrypt.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_gcrypt_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_gcrypt_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_gcrypt_h" >&5
-echo "${ECHO_T}$ac_cv_header_gcrypt_h" >&6; }
+if ac_fn_c_try_run "$LINENO"; then :
 
-fi
-if test $ac_cv_header_gcrypt_h = yes; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      ac_fn_c_check_header_mongrel "$LINENO" "gcrypt.h" "ac_cv_header_gcrypt_h" "$ac_includes_default"
+if test "x$ac_cv_header_gcrypt_h" = x""yes; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CURL_GNUTLS 1
-_ACEOF
+$as_echo "#define HAVE_CURL_GNUTLS 1" >>confdefs.h
 
 
 fi
@@ -39252,25 +28936,20 @@ fi
 
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
-
     CFLAGS="$save_CFLAGS"
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
@@ -39335,10 +29014,10 @@ echo "${ECHO_T}no" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -39370,18 +29049,14 @@ echo "${ECHO_T}no" >&6; }
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for curl_easy_perform in -lcurl" >&5
-echo $ECHO_N "checking for curl_easy_perform in -lcurl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_curl_curl_easy_perform+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_perform in -lcurl" >&5
+$as_echo_n "checking for curl_easy_perform in -lcurl... " >&6; }
+if test "${ac_cv_lib_curl_curl_easy_perform+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -39399,47 +29074,24 @@ return curl_easy_perform ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_curl_curl_easy_perform=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_curl_curl_easy_perform=no
+  ac_cv_lib_curl_curl_easy_perform=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_curl_curl_easy_perform" >&5
-echo "${ECHO_T}$ac_cv_lib_curl_curl_easy_perform" >&6; }
-if test $ac_cv_lib_curl_curl_easy_perform = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_perform" >&5
+$as_echo "$ac_cv_lib_curl_curl_easy_perform" >&6; }
+if test "x$ac_cv_lib_curl_curl_easy_perform" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CURL 1
-_ACEOF
+$as_echo "#define HAVE_CURL 1" >>confdefs.h
 
 
 
@@ -39449,9 +29101,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_curl_curl_easy_perform
 
-    { { echo "$as_me:$LINENO: error: There is something wrong. Please check config.log for more information." >&5
-echo "$as_me: error: There is something wrong. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "There is something wrong. Please check config.log for more information." "$LINENO" 5
 
 
 fi
@@ -39519,10 +29169,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -39554,18 +29204,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for curl_version_info in -lcurl" >&5
-echo $ECHO_N "checking for curl_version_info in -lcurl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_curl_curl_version_info+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_version_info in -lcurl" >&5
+$as_echo_n "checking for curl_version_info in -lcurl... " >&6; }
+if test "${ac_cv_lib_curl_curl_version_info+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -39583,47 +29229,24 @@ return curl_version_info ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_curl_curl_version_info=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_curl_curl_version_info=no
+  ac_cv_lib_curl_curl_version_info=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_curl_curl_version_info" >&5
-echo "${ECHO_T}$ac_cv_lib_curl_curl_version_info" >&6; }
-if test $ac_cv_lib_curl_curl_version_info = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_version_info" >&5
+$as_echo "$ac_cv_lib_curl_curl_version_info" >&6; }
+if test "x$ac_cv_lib_curl_curl_version_info" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CURL_VERSION_INFO 1
-_ACEOF
+$as_echo "#define HAVE_CURL_VERSION_INFO 1" >>confdefs.h
 
 
 
@@ -39699,10 +29322,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -39734,18 +29357,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for curl_easy_strerror in -lcurl" >&5
-echo $ECHO_N "checking for curl_easy_strerror in -lcurl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_curl_curl_easy_strerror+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_strerror in -lcurl" >&5
+$as_echo_n "checking for curl_easy_strerror in -lcurl... " >&6; }
+if test "${ac_cv_lib_curl_curl_easy_strerror+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -39763,47 +29382,24 @@ return curl_easy_strerror ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_curl_curl_easy_strerror=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_curl_curl_easy_strerror=no
+  ac_cv_lib_curl_curl_easy_strerror=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_curl_curl_easy_strerror" >&5
-echo "${ECHO_T}$ac_cv_lib_curl_curl_easy_strerror" >&6; }
-if test $ac_cv_lib_curl_curl_easy_strerror = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_strerror" >&5
+$as_echo "$ac_cv_lib_curl_curl_easy_strerror" >&6; }
+if test "x$ac_cv_lib_curl_curl_easy_strerror" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CURL_EASY_STRERROR 1
-_ACEOF
+$as_echo "#define HAVE_CURL_EASY_STRERROR 1" >>confdefs.h
 
 
 
@@ -39879,10 +29475,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -39914,18 +29510,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for curl_multi_strerror in -lcurl" >&5
-echo $ECHO_N "checking for curl_multi_strerror in -lcurl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_curl_curl_multi_strerror+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_multi_strerror in -lcurl" >&5
+$as_echo_n "checking for curl_multi_strerror in -lcurl... " >&6; }
+if test "${ac_cv_lib_curl_curl_multi_strerror+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -39943,47 +29535,24 @@ return curl_multi_strerror ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_curl_curl_multi_strerror=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_curl_curl_multi_strerror=no
+  ac_cv_lib_curl_curl_multi_strerror=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_curl_curl_multi_strerror" >&5
-echo "${ECHO_T}$ac_cv_lib_curl_curl_multi_strerror" >&6; }
-if test $ac_cv_lib_curl_curl_multi_strerror = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_multi_strerror" >&5
+$as_echo "$ac_cv_lib_curl_curl_multi_strerror" >&6; }
+if test "x$ac_cv_lib_curl_curl_multi_strerror" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CURL_MULTI_STRERROR 1
-_ACEOF
+$as_echo "#define HAVE_CURL_MULTI_STRERROR 1" >>confdefs.h
 
 
 
@@ -39999,9 +29568,7 @@ fi
 
   if test "$PHP_CURLWRAPPERS" != "no" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define PHP_CURL_URL_WRAPPERS 1
-_ACEOF
+$as_echo "#define PHP_CURL_URL_WRAPPERS 1" >>confdefs.h
 
   fi
 
@@ -40323,7 +29890,7 @@ php_enable_dba=no
 
 
 # Check whether --enable-dba was given.
-if test "${enable_dba+set}" = set; then
+if test "${enable_dba+set}" = set; then :
   enableval=$enable_dba; PHP_DBA=$enableval
 else
 
@@ -40366,7 +29933,7 @@ php_with_qdbm=no
 
 
 # Check whether --with-qdbm was given.
-if test "${with_qdbm+set}" = set; then
+if test "${with_qdbm+set}" = set; then :
   withval=$with_qdbm; PHP_QDBM=$withval
 else
 
@@ -40388,7 +29955,7 @@ php_with_gdbm=no
 
 
 # Check whether --with-gdbm was given.
-if test "${with_gdbm+set}" = set; then
+if test "${with_gdbm+set}" = set; then :
   withval=$with_gdbm; PHP_GDBM=$withval
 else
 
@@ -40410,7 +29977,7 @@ php_with_ndbm=no
 
 
 # Check whether --with-ndbm was given.
-if test "${with_ndbm+set}" = set; then
+if test "${with_ndbm+set}" = set; then :
   withval=$with_ndbm; PHP_NDBM=$withval
 else
 
@@ -40432,7 +29999,7 @@ php_with_db4=no
 
 
 # Check whether --with-db4 was given.
-if test "${with_db4+set}" = set; then
+if test "${with_db4+set}" = set; then :
   withval=$with_db4; PHP_DB4=$withval
 else
 
@@ -40454,7 +30021,7 @@ php_with_db3=no
 
 
 # Check whether --with-db3 was given.
-if test "${with_db3+set}" = set; then
+if test "${with_db3+set}" = set; then :
   withval=$with_db3; PHP_DB3=$withval
 else
 
@@ -40476,7 +30043,7 @@ php_with_db2=no
 
 
 # Check whether --with-db2 was given.
-if test "${with_db2+set}" = set; then
+if test "${with_db2+set}" = set; then :
   withval=$with_db2; PHP_DB2=$withval
 else
 
@@ -40498,7 +30065,7 @@ php_with_db1=no
 
 
 # Check whether --with-db1 was given.
-if test "${with_db1+set}" = set; then
+if test "${with_db1+set}" = set; then :
   withval=$with_db1; PHP_DB1=$withval
 else
 
@@ -40520,7 +30087,7 @@ php_with_dbm=no
 
 
 # Check whether --with-dbm was given.
-if test "${with_dbm+set}" = set; then
+if test "${with_dbm+set}" = set; then :
   withval=$with_dbm; PHP_DBM=$withval
 else
 
@@ -40542,7 +30109,7 @@ php_with_tcadb=no
 
 
 # Check whether --with-tcadb was given.
-if test "${with_tcadb+set}" = set; then
+if test "${with_tcadb+set}" = set; then :
   withval=$with_tcadb; PHP_TCADB=$withval
 else
 
@@ -40635,10 +30202,10 @@ if test "$PHP_QDBM" != "no"; then
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -40670,19 +30237,15 @@ if test "$PHP_QDBM" != "no"; then
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$LIB''_dpopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dpopen in -l$LIB" >&5
-echo $ECHO_N "checking for dpopen in -l$LIB... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_dpopen" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dpopen in -l$LIB" >&5
+$as_echo_n "checking for dpopen in -l$LIB... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -40700,40 +30263,20 @@ return dpopen ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -40744,9 +30287,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-cat >>confdefs.h <<\_ACEOF
-#define DBA_QDBM 1
-_ACEOF
+$as_echo "#define DBA_QDBM 1" >>confdefs.h
 
         THIS_LIBS=$LIB
 
@@ -40774,14 +30315,10 @@ fi
 
   THIS_RESULT=yes
   if test -z "$THIS_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5
-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "DBA: Could not find necessary header file(s)." "$LINENO" 5
   fi
   if test -z "$THIS_LIBS"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5
-echo "$as_me: error: DBA: Could not find necessary library." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "DBA: Could not find necessary library." "$LINENO" 5
   fi
 
 
@@ -40797,10 +30334,10 @@ echo "$as_me: error: DBA: Could not find necessary library." >&2;}
     ai_p=$THIS_LFLAGS
   else
 
-    ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THIS_LFLAGS"`
   fi
 
 
@@ -40840,10 +30377,10 @@ echo "$as_me: error: DBA: Could not find necessary library." >&2;}
     ai_p=$THIS_LFLAGS
   else
 
-    ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THIS_LFLAGS"`
   fi
 
 
@@ -40892,21 +30429,19 @@ fi
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { echo "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -40924,21 +30459,19 @@ if test "$PHP_GDBM" != "no"; then
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n "You cannot combine --with-gdbm with --with-qdbm"; then
-    { { echo "$as_me:$LINENO: error: You cannot combine --with-gdbm with --with-qdbm" >&5
-echo "$as_me: error: You cannot combine --with-gdbm with --with-qdbm" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "You cannot combine --with-gdbm with --with-qdbm" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { echo "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -41012,10 +30545,10 @@ echo "${ECHO_T}no" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -41047,18 +30580,14 @@ echo "${ECHO_T}no" >&6; }
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdbm_open in -lgdbm" >&5
-echo $ECHO_N "checking for gdbm_open in -lgdbm... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gdbm_gdbm_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdbm_open in -lgdbm" >&5
+$as_echo_n "checking for gdbm_open in -lgdbm... " >&6; }
+if test "${ac_cv_lib_gdbm_gdbm_open+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgdbm  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -41076,39 +30605,18 @@ return gdbm_open ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gdbm_gdbm_open=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gdbm_gdbm_open=no
+  ac_cv_lib_gdbm_gdbm_open=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gdbm_gdbm_open" >&5
-echo "${ECHO_T}$ac_cv_lib_gdbm_gdbm_open" >&6; }
-if test $ac_cv_lib_gdbm_gdbm_open = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_gdbm_open" >&5
+$as_echo "$ac_cv_lib_gdbm_gdbm_open" >&6; }
+if test "x$ac_cv_lib_gdbm_gdbm_open" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -41119,9 +30627,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-cat >>confdefs.h <<\_ACEOF
-#define DBA_GDBM 1
-_ACEOF
+$as_echo "#define DBA_GDBM 1" >>confdefs.h
 
       THIS_LIBS=gdbm
 
@@ -41145,14 +30651,10 @@ fi
 
   THIS_RESULT=yes
   if test -z "$THIS_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5
-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "DBA: Could not find necessary header file(s)." "$LINENO" 5
   fi
   if test -z "$THIS_LIBS"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5
-echo "$as_me: error: DBA: Could not find necessary library." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "DBA: Could not find necessary library." "$LINENO" 5
   fi
 
 
@@ -41168,10 +30670,10 @@ echo "$as_me: error: DBA: Could not find necessary library." >&2;}
     ai_p=$THIS_LFLAGS
   else
 
-    ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THIS_LFLAGS"`
   fi
 
 
@@ -41211,10 +30713,10 @@ echo "$as_me: error: DBA: Could not find necessary library." >&2;}
     ai_p=$THIS_LFLAGS
   else
 
-    ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THIS_LFLAGS"`
   fi
 
 
@@ -41263,21 +30765,19 @@ fi
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { echo "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -41361,10 +30861,10 @@ if test "$PHP_NDBM" != "no"; then
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -41396,19 +30896,15 @@ if test "$PHP_NDBM" != "no"; then
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$LIB''_dbm_open" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbm_open in -l$LIB" >&5
-echo $ECHO_N "checking for dbm_open in -l$LIB... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_dbm_open" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -l$LIB" >&5
+$as_echo_n "checking for dbm_open in -l$LIB... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -41426,40 +30922,20 @@ return dbm_open ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -41470,9 +30946,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-cat >>confdefs.h <<\_ACEOF
-#define DBA_NDBM 1
-_ACEOF
+$as_echo "#define DBA_NDBM 1" >>confdefs.h
 
         THIS_LIBS=$LIB
 
@@ -41500,14 +30974,10 @@ fi
 
   THIS_RESULT=yes
   if test -z "$THIS_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5
-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "DBA: Could not find necessary header file(s)." "$LINENO" 5
   fi
   if test -z "$THIS_LIBS"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5
-echo "$as_me: error: DBA: Could not find necessary library." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "DBA: Could not find necessary library." "$LINENO" 5
   fi
 
 
@@ -41523,10 +30993,10 @@ echo "$as_me: error: DBA: Could not find necessary library." >&2;}
     ai_p=$THIS_LFLAGS
   else
 
-    ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THIS_LFLAGS"`
   fi
 
 
@@ -41566,10 +31036,10 @@ echo "$as_me: error: DBA: Could not find necessary library." >&2;}
     ai_p=$THIS_LFLAGS
   else
 
-    ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THIS_LFLAGS"`
   fi
 
 
@@ -41618,21 +31088,19 @@ fi
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { echo "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -41651,10 +31119,10 @@ if test "$PHP_TCADB" != "no"; then
     ai_p=$THIS_PREFIX/include
   else
 
-    ep_dir="`echo $THIS_PREFIX/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THIS_PREFIX/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THIS_PREFIX/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THIS_PREFIX/include"`
   fi
 
 
@@ -41742,10 +31210,10 @@ if test "$PHP_TCADB" != "no"; then
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -41777,19 +31245,15 @@ if test "$PHP_TCADB" != "no"; then
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$LIB''_tcadbopen" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for tcadbopen in -l$LIB" >&5
-echo $ECHO_N "checking for tcadbopen in -l$LIB... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_tcadbopen" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tcadbopen in -l$LIB" >&5
+$as_echo_n "checking for tcadbopen in -l$LIB... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -41807,40 +31271,20 @@ return tcadbopen ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -41851,9 +31295,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-cat >>confdefs.h <<\_ACEOF
-#define DBA_TCADB 1
-_ACEOF
+$as_echo "#define DBA_TCADB 1" >>confdefs.h
 
 		THIS_LIBS=$LIB
 
@@ -41881,14 +31323,10 @@ fi
 
   THIS_RESULT=yes
   if test -z "$THIS_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5
-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "DBA: Could not find necessary header file(s)." "$LINENO" 5
   fi
   if test -z "$THIS_LIBS"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5
-echo "$as_me: error: DBA: Could not find necessary library." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "DBA: Could not find necessary library." "$LINENO" 5
   fi
 
 
@@ -41904,10 +31342,10 @@ echo "$as_me: error: DBA: Could not find necessary library." >&2;}
     ai_p=$THIS_LFLAGS
   else
 
-    ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THIS_LFLAGS"`
   fi
 
 
@@ -41947,10 +31385,10 @@ echo "$as_me: error: DBA: Could not find necessary library." >&2;}
     ai_p=$THIS_LFLAGS
   else
 
-    ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THIS_LFLAGS"`
   fi
 
 
@@ -41999,21 +31437,19 @@ fi
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { echo "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -42080,9 +31516,7 @@ if test "$PHP_DB4" != "no"; then
   done
 
   if test -z "$THIS_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5
-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "DBA: Could not find necessary header file(s)." "$LINENO" 5
   fi
   for LIB in db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db; do
     if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then
@@ -42093,11 +31527,7 @@ echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
   old_LIBS=$LIBS
   LIBS="-l$LIB $LIBS"
 
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include "$THIS_INCLUDE"
@@ -42112,30 +31542,9 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
 
-          cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include "$THIS_INCLUDE"
@@ -42145,24 +31554,18 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
+  $EGREP "yes" >/dev/null 2>&1; then :
 
             THIS_LIBS=$LIB
             lib_found=1
 
 fi
-rm -f -r conftest*
-
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+rm -f conftest*
 
 
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
@@ -42174,20 +31577,14 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
     fi
   done
   if test -z "$THIS_LIBS"; then
-    { echo "$as_me:$LINENO: checking for DB4 major version" >&5
-echo $ECHO_N "checking for DB4 major version... $ECHO_C" >&6; }
-    { { echo "$as_me:$LINENO: error: Header contains different version" >&5
-echo "$as_me: error: Header contains different version" >&2;}
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB4 major version" >&5
+$as_echo_n "checking for DB4 major version... " >&6; }
+    as_fn_error "Header contains different version" "$LINENO" 5
   fi
   if test "4" = "4"; then
-    { echo "$as_me:$LINENO: checking for DB4 minor version and patch level" >&5
-echo $ECHO_N "checking for DB4 minor version and patch level... $ECHO_C" >&6; }
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5
+$as_echo_n "checking for DB4 minor version and patch level... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include "$THIS_INCLUDE"
@@ -42197,29 +31594,23 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
+  $EGREP "yes" >/dev/null 2>&1; then :
 
-      { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
 
 else
 
-      { { echo "$as_me:$LINENO: error: Version 4.1 requires patch level 25" >&5
-echo "$as_me: error: Version 4.1 requires patch level 25" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Version 4.1 requires patch level 25" "$LINENO" 5
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
   fi
   if test "$ext_shared" = "yes"; then
-    { echo "$as_me:$LINENO: checking if dba can be used as shared extension" >&5
-echo $ECHO_N "checking if dba can be used as shared extension... $ECHO_C" >&6; }
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5
+$as_echo_n "checking if dba can be used as shared extension... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include "$THIS_INCLUDE"
@@ -42229,26 +31620,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
+  $EGREP "yes" >/dev/null 2>&1; then :
 
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
 
-      { { echo "$as_me:$LINENO: error: At least version 3.3 is required" >&5
-echo "$as_me: error: At least version 3.3 is required" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "At least version 3.3 is required" "$LINENO" 5
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
   fi
   if test -n "$THIS_LIBS"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define DBA_DB4 1
-_ACEOF
+$as_echo "#define DBA_DB4 1" >>confdefs.h
 
     if test -n "$THIS_INCLUDE"; then
 
@@ -42258,9 +31645,7 @@ _ACEOF
 
     fi
   else
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5
-echo "$as_me: error: DBA: Could not find necessary library." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "DBA: Could not find necessary library." "$LINENO" 5
   fi
   THIS_RESULT=yes
   DB4_LIBS=$THIS_LIBS
@@ -42284,10 +31669,10 @@ echo "$as_me: error: DBA: Could not find necessary library." >&2;}
     ai_p=$THIS_LFLAGS
   else
 
-    ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THIS_LFLAGS"`
   fi
 
 
@@ -42327,10 +31712,10 @@ echo "$as_me: error: DBA: Could not find necessary library." >&2;}
     ai_p=$THIS_LFLAGS
   else
 
-    ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THIS_LFLAGS"`
   fi
 
 
@@ -42380,21 +31765,19 @@ fi
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { echo "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -42412,21 +31795,19 @@ if test "$PHP_DB3" != "no"; then
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n "You cannot combine --with-db3 with --with-db4"; then
-    { { echo "$as_me:$LINENO: error: You cannot combine --with-db3 with --with-db4" >&5
-echo "$as_me: error: You cannot combine --with-db3 with --with-db4" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "You cannot combine --with-db3 with --with-db4" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { echo "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -42456,9 +31837,7 @@ echo "${ECHO_T}no" >&6; }
   done
 
   if test -z "$THIS_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5
-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "DBA: Could not find necessary header file(s)." "$LINENO" 5
   fi
   for LIB in db-3.3 db-3.2 db-3.1 db-3.0 db-3 db3 db; do
     if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then
@@ -42469,11 +31848,7 @@ echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
   old_LIBS=$LIBS
   LIBS="-l$LIB $LIBS"
 
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include "$THIS_INCLUDE"
@@ -42488,30 +31863,9 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
 
-          cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include "$THIS_INCLUDE"
@@ -42521,24 +31875,18 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
+  $EGREP "yes" >/dev/null 2>&1; then :
 
             THIS_LIBS=$LIB
             lib_found=1
 
 fi
-rm -f -r conftest*
-
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+rm -f conftest*
 
 
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
@@ -42550,20 +31898,14 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
     fi
   done
   if test -z "$THIS_LIBS"; then
-    { echo "$as_me:$LINENO: checking for DB3 major version" >&5
-echo $ECHO_N "checking for DB3 major version... $ECHO_C" >&6; }
-    { { echo "$as_me:$LINENO: error: Header contains different version" >&5
-echo "$as_me: error: Header contains different version" >&2;}
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB3 major version" >&5
+$as_echo_n "checking for DB3 major version... " >&6; }
+    as_fn_error "Header contains different version" "$LINENO" 5
   fi
   if test "3" = "4"; then
-    { echo "$as_me:$LINENO: checking for DB4 minor version and patch level" >&5
-echo $ECHO_N "checking for DB4 minor version and patch level... $ECHO_C" >&6; }
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5
+$as_echo_n "checking for DB4 minor version and patch level... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include "$THIS_INCLUDE"
@@ -42573,29 +31915,23 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
+  $EGREP "yes" >/dev/null 2>&1; then :
 
-      { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
 
 else
 
-      { { echo "$as_me:$LINENO: error: Version 4.1 requires patch level 25" >&5
-echo "$as_me: error: Version 4.1 requires patch level 25" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Version 4.1 requires patch level 25" "$LINENO" 5
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
   fi
   if test "$ext_shared" = "yes"; then
-    { echo "$as_me:$LINENO: checking if dba can be used as shared extension" >&5
-echo $ECHO_N "checking if dba can be used as shared extension... $ECHO_C" >&6; }
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5
+$as_echo_n "checking if dba can be used as shared extension... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include "$THIS_INCLUDE"
@@ -42605,26 +31941,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
+  $EGREP "yes" >/dev/null 2>&1; then :
 
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
 
-      { { echo "$as_me:$LINENO: error: At least version 3.3 is required" >&5
-echo "$as_me: error: At least version 3.3 is required" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "At least version 3.3 is required" "$LINENO" 5
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
   fi
   if test -n "$THIS_LIBS"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define DBA_DB3 1
-_ACEOF
+$as_echo "#define DBA_DB3 1" >>confdefs.h
 
     if test -n "$THIS_INCLUDE"; then
 
@@ -42634,9 +31966,7 @@ _ACEOF
 
     fi
   else
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5
-echo "$as_me: error: DBA: Could not find necessary library." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "DBA: Could not find necessary library." "$LINENO" 5
   fi
   THIS_RESULT=yes
   DB3_LIBS=$THIS_LIBS
@@ -42660,10 +31990,10 @@ echo "$as_me: error: DBA: Could not find necessary library." >&2;}
     ai_p=$THIS_LFLAGS
   else
 
-    ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THIS_LFLAGS"`
   fi
 
 
@@ -42703,10 +32033,10 @@ echo "$as_me: error: DBA: Could not find necessary library." >&2;}
     ai_p=$THIS_LFLAGS
   else
 
-    ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THIS_LFLAGS"`
   fi
 
 
@@ -42756,21 +32086,19 @@ fi
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { echo "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -42788,21 +32116,19 @@ if test "$PHP_DB2" != "no"; then
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n "You cannot combine --with-db2 with --with-db3 or --with-db4"; then
-    { { echo "$as_me:$LINENO: error: You cannot combine --with-db2 with --with-db3 or --with-db4" >&5
-echo "$as_me: error: You cannot combine --with-db2 with --with-db3 or --with-db4" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "You cannot combine --with-db2 with --with-db3 or --with-db4" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { echo "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -42832,9 +32158,7 @@ echo "${ECHO_T}no" >&6; }
   done
 
   if test -z "$THIS_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5
-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "DBA: Could not find necessary header file(s)." "$LINENO" 5
   fi
   for LIB in db-2 db2 db; do
     if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then
@@ -42845,11 +32169,7 @@ echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
   old_LIBS=$LIBS
   LIBS="-l$LIB $LIBS"
 
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include "$THIS_INCLUDE"
@@ -42864,30 +32184,9 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
 
-          cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include "$THIS_INCLUDE"
@@ -42897,24 +32196,18 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
+  $EGREP "yes" >/dev/null 2>&1; then :
 
             THIS_LIBS=$LIB
             lib_found=1
 
 fi
-rm -f -r conftest*
-
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+rm -f conftest*
 
 
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
@@ -42926,20 +32219,14 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
     fi
   done
   if test -z "$THIS_LIBS"; then
-    { echo "$as_me:$LINENO: checking for DB2 major version" >&5
-echo $ECHO_N "checking for DB2 major version... $ECHO_C" >&6; }
-    { { echo "$as_me:$LINENO: error: Header contains different version" >&5
-echo "$as_me: error: Header contains different version" >&2;}
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB2 major version" >&5
+$as_echo_n "checking for DB2 major version... " >&6; }
+    as_fn_error "Header contains different version" "$LINENO" 5
   fi
   if test "2" = "4"; then
-    { echo "$as_me:$LINENO: checking for DB4 minor version and patch level" >&5
-echo $ECHO_N "checking for DB4 minor version and patch level... $ECHO_C" >&6; }
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5
+$as_echo_n "checking for DB4 minor version and patch level... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include "$THIS_INCLUDE"
@@ -42949,29 +32236,23 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
+  $EGREP "yes" >/dev/null 2>&1; then :
 
-      { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
 
 else
 
-      { { echo "$as_me:$LINENO: error: Version 4.1 requires patch level 25" >&5
-echo "$as_me: error: Version 4.1 requires patch level 25" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Version 4.1 requires patch level 25" "$LINENO" 5
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
   fi
   if test "$ext_shared" = "yes"; then
-    { echo "$as_me:$LINENO: checking if dba can be used as shared extension" >&5
-echo $ECHO_N "checking if dba can be used as shared extension... $ECHO_C" >&6; }
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5
+$as_echo_n "checking if dba can be used as shared extension... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include "$THIS_INCLUDE"
@@ -42981,26 +32262,22 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
+  $EGREP "yes" >/dev/null 2>&1; then :
 
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
 
-      { { echo "$as_me:$LINENO: error: At least version 3.3 is required" >&5
-echo "$as_me: error: At least version 3.3 is required" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "At least version 3.3 is required" "$LINENO" 5
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
   fi
   if test -n "$THIS_LIBS"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define DBA_DB2 1
-_ACEOF
+$as_echo "#define DBA_DB2 1" >>confdefs.h
 
     if test -n "$THIS_INCLUDE"; then
 
@@ -43010,9 +32287,7 @@ _ACEOF
 
     fi
   else
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5
-echo "$as_me: error: DBA: Could not find necessary library." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "DBA: Could not find necessary library." "$LINENO" 5
   fi
   THIS_RESULT=yes
   DB2_LIBS=$THIS_LIBS
@@ -43036,10 +32311,10 @@ echo "$as_me: error: DBA: Could not find necessary library." >&2;}
     ai_p=$THIS_LFLAGS
   else
 
-    ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THIS_LFLAGS"`
   fi
 
 
@@ -43079,10 +32354,10 @@ echo "$as_me: error: DBA: Could not find necessary library." >&2;}
     ai_p=$THIS_LFLAGS
   else
 
-    ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THIS_LFLAGS"`
   fi
 
 
@@ -43132,21 +32407,19 @@ fi
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { echo "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -43156,8 +32429,8 @@ if test "$PHP_DB1" != "no"; then
 
   unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
 
-  { echo "$as_me:$LINENO: checking for DB1 in library" >&5
-echo $ECHO_N "checking for DB1 in library... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB1 in library" >&5
+$as_echo_n "checking for DB1 in library... " >&6; }
   if test "$HAVE_DB4" = "1"; then
     THIS_VERSION=4
     THIS_LIBS=$DB4_LIBS
@@ -43205,12 +32478,12 @@ _ACEOF
     done
     THIS_LIBS=db
   fi
-  { echo "$as_me:$LINENO: result: $THIS_LIBS" >&5
-echo "${ECHO_T}$THIS_LIBS" >&6; }
-  { echo "$as_me:$LINENO: checking for DB1 in header" >&5
-echo $ECHO_N "checking for DB1 in header... $ECHO_C" >&6; }
-  { echo "$as_me:$LINENO: result: $THIS_INCLUDE" >&5
-echo "${ECHO_T}$THIS_INCLUDE" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_LIBS" >&5
+$as_echo "$THIS_LIBS" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DB1 in header" >&5
+$as_echo_n "checking for DB1 in header... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_INCLUDE" >&5
+$as_echo "$THIS_INCLUDE" >&6; }
   if test -n "$THIS_INCLUDE"; then
 
   old_LDFLAGS=$LDFLAGS
@@ -43218,11 +32491,7 @@ echo "${ECHO_T}$THIS_INCLUDE" >&6; }
   old_LIBS=$LIBS
   LIBS="-l$THIS_LIBS $LIBS"
 
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include "$THIS_INCLUDE"
@@ -43237,24 +32506,7 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
 
 
 cat >>confdefs.h <<_ACEOF
@@ -43262,23 +32514,17 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-cat >>confdefs.h <<\_ACEOF
-#define DBA_DB1 1
-_ACEOF
+$as_echo "#define DBA_DB1 1" >>confdefs.h
 
         THIS_RESULT=yes
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
         THIS_RESULT=no
 
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
@@ -43292,14 +32538,10 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 
   THIS_RESULT=yes
   if test -z "$THIS_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5
-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "DBA: Could not find necessary header file(s)." "$LINENO" 5
   fi
   if test -z "$THIS_LIBS"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5
-echo "$as_me: error: DBA: Could not find necessary library." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "DBA: Could not find necessary library." "$LINENO" 5
   fi
 
 
@@ -43315,10 +32557,10 @@ echo "$as_me: error: DBA: Could not find necessary library." >&2;}
     ai_p=$THIS_LFLAGS
   else
 
-    ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THIS_LFLAGS"`
   fi
 
 
@@ -43358,10 +32600,10 @@ echo "$as_me: error: DBA: Could not find necessary library." >&2;}
     ai_p=$THIS_LFLAGS
   else
 
-    ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THIS_LFLAGS"`
   fi
 
 
@@ -43410,21 +32652,19 @@ fi
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { echo "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -43442,21 +32682,19 @@ if test "$PHP_DBM" != "no"; then
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n "You cannot combine --with-dbm with --with-qdbm"; then
-    { { echo "$as_me:$LINENO: error: You cannot combine --with-dbm with --with-qdbm" >&5
-echo "$as_me: error: You cannot combine --with-dbm with --with-qdbm" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "You cannot combine --with-dbm with --with-qdbm" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { echo "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -43535,10 +32773,10 @@ echo "${ECHO_T}no" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -43570,19 +32808,15 @@ echo "${ECHO_T}no" >&6; }
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$LIB''_dbminit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dbminit in -l$LIB" >&5
-echo $ECHO_N "checking for dbminit in -l$LIB... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_dbminit" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbminit in -l$LIB" >&5
+$as_echo_n "checking for dbminit in -l$LIB... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -43600,46 +32834,26 @@ return dbminit ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-        { echo "$as_me:$LINENO: checking for DBM using GDBM" >&5
-echo $ECHO_N "checking for DBM using GDBM... $ECHO_C" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBM using GDBM" >&5
+$as_echo_n "checking for DBM using GDBM... " >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define DBM_INCLUDE_FILE "$THIS_INCLUDE"
@@ -43651,21 +32865,19 @@ cat >>confdefs.h <<_ACEOF
 #define DBM_VERSION "GDBM"
 _ACEOF
 
-          { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
         else
 
 cat >>confdefs.h <<_ACEOF
 #define DBM_VERSION "DBM"
 _ACEOF
 
-          { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         fi
 
-cat >>confdefs.h <<\_ACEOF
-#define DBA_DBM 1
-_ACEOF
+$as_echo "#define DBA_DBM 1" >>confdefs.h
 
         THIS_LIBS=$LIB
 
@@ -43693,14 +32905,10 @@ fi
 
   THIS_RESULT=yes
   if test -z "$THIS_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5
-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "DBA: Could not find necessary header file(s)." "$LINENO" 5
   fi
   if test -z "$THIS_LIBS"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5
-echo "$as_me: error: DBA: Could not find necessary library." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "DBA: Could not find necessary library." "$LINENO" 5
   fi
 
 
@@ -43716,10 +32924,10 @@ echo "$as_me: error: DBA: Could not find necessary library." >&2;}
     ai_p=$THIS_LFLAGS
   else
 
-    ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THIS_LFLAGS"`
   fi
 
 
@@ -43759,10 +32967,10 @@ echo "$as_me: error: DBA: Could not find necessary library." >&2;}
     ai_p=$THIS_LFLAGS
   else
 
-    ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THIS_LFLAGS"`
   fi
 
 
@@ -43811,21 +33019,19 @@ fi
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { echo "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -43842,7 +33048,7 @@ php_with_cdb=$php_dba_enable
 
 
 # Check whether --with-cdb was given.
-if test "${with_cdb+set}" = set; then
+if test "${with_cdb+set}" = set; then :
   withval=$with_cdb; PHP_CDB=$withval
 else
 
@@ -43863,7 +33069,7 @@ php_enable_inifile=$php_dba_enable
 
 
 # Check whether --enable-inifile was given.
-if test "${enable_inifile+set}" = set; then
+if test "${enable_inifile+set}" = set; then :
   enableval=$enable_inifile; PHP_INIFILE=$enableval
 else
 
@@ -43884,7 +33090,7 @@ php_enable_flatfile=$php_dba_enable
 
 
 # Check whether --enable-flatfile was given.
-if test "${enable_flatfile+set}" = set; then
+if test "${enable_flatfile+set}" = set; then :
   enableval=$enable_flatfile; PHP_FLATFILE=$enableval
 else
 
@@ -43903,19 +33109,13 @@ ext_output=$PHP_FLATFILE
 # CDB
 if test "$PHP_CDB" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define DBA_CDB_BUILTIN 1
-_ACEOF
+$as_echo "#define DBA_CDB_BUILTIN 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define DBA_CDB_MAKE 1
-_ACEOF
+$as_echo "#define DBA_CDB_MAKE 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define DBA_CDB 1
-_ACEOF
+$as_echo "#define DBA_CDB 1" >>confdefs.h
 
   cdb_sources="libcdb/cdb.c libcdb/cdb_make.c libcdb/uint32.c"
   THIS_RESULT="builtin"
@@ -43993,10 +33193,10 @@ elif test "$PHP_CDB" != "no"; then
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -44028,19 +33228,15 @@ elif test "$PHP_CDB" != "no"; then
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$LIB''_cdb_read" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for cdb_read in -l$LIB" >&5
-echo $ECHO_N "checking for cdb_read in -l$LIB... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_cdb_read" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cdb_read in -l$LIB" >&5
+$as_echo_n "checking for cdb_read in -l$LIB... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -44058,40 +33254,20 @@ return cdb_read ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -44102,9 +33278,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-cat >>confdefs.h <<\_ACEOF
-#define DBA_CDB 1
-_ACEOF
+$as_echo "#define DBA_CDB 1" >>confdefs.h
 
         THIS_LIBS=$LIB
 
@@ -44132,14 +33306,10 @@ fi
 
   THIS_RESULT=yes
   if test -z "$THIS_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary header file(s)." >&5
-echo "$as_me: error: DBA: Could not find necessary header file(s)." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "DBA: Could not find necessary header file(s)." "$LINENO" 5
   fi
   if test -z "$THIS_LIBS"; then
-    { { echo "$as_me:$LINENO: error: DBA: Could not find necessary library." >&5
-echo "$as_me: error: DBA: Could not find necessary library." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "DBA: Could not find necessary library." "$LINENO" 5
   fi
 
 
@@ -44155,10 +33325,10 @@ echo "$as_me: error: DBA: Could not find necessary library." >&2;}
     ai_p=$THIS_LFLAGS
   else
 
-    ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THIS_LFLAGS"`
   fi
 
 
@@ -44198,10 +33368,10 @@ echo "$as_me: error: DBA: Could not find necessary library." >&2;}
     ai_p=$THIS_LFLAGS
   else
 
-    ep_dir="`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $THIS_LFLAGS|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$THIS_LFLAGS\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$THIS_LFLAGS"`
   fi
 
 
@@ -44250,21 +33420,19 @@ fi
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { echo "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -44272,9 +33440,7 @@ echo "${ECHO_T}no" >&6; }
 # INIFILE
 if test "$PHP_INIFILE" != "no"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define DBA_INIFILE 1
-_ACEOF
+$as_echo "#define DBA_INIFILE 1" >>confdefs.h
 
   ini_sources="libinifile/inifile.c"
   THIS_RESULT="builtin"
@@ -44286,21 +33452,19 @@ fi
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { echo "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -44308,9 +33472,7 @@ echo "${ECHO_T}no" >&6; }
 # FLATFILE
 if test "$PHP_FLATFILE" != "no"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define DBA_FLATFILE 1
-_ACEOF
+$as_echo "#define DBA_FLATFILE 1" >>confdefs.h
 
   flat_sources="libflatfile/flatfile.c"
   THIS_RESULT="builtin"
@@ -44322,39 +33484,35 @@ fi
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { echo "$as_me:$LINENO: checking for $THIS_FULL_NAME support" >&5
-echo $ECHO_N "checking for $THIS_FULL_NAME support... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
+$as_echo_n "checking for $THIS_FULL_NAME support... " >&6; }
   if test -n ""; then
-    { { echo "$as_me:$LINENO: error: " >&5
-echo "$as_me: error: " >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { echo "$as_me:$LINENO: result: $THIS_RESULT" >&5
-echo "${ECHO_T}$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
 
-{ echo "$as_me:$LINENO: checking whether to enable DBA interface" >&5
-echo $ECHO_N "checking whether to enable DBA interface... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable DBA interface" >&5
+$as_echo_n "checking whether to enable DBA interface... " >&6; }
 if test "$HAVE_DBA" = "1"; then
   if test "$ext_shared" = "yes"; then
-    { echo "$as_me:$LINENO: result: yes, shared" >&5
-echo "${ECHO_T}yes, shared" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, shared" >&5
+$as_echo "yes, shared" >&6; }
   else
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   fi
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DBA 1
-_ACEOF
+$as_echo "#define HAVE_DBA 1" >>confdefs.h
 
 
   ext_builddir=ext/dba
@@ -44668,18 +33826,18 @@ EOF
   PHP_VAR_SUBST="$PHP_VAR_SUBST DBA_SHARED_LIBADD"
 
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 
 php_enable_dom=yes
 
-{ echo "$as_me:$LINENO: checking whether to enable DOM support" >&5
-echo $ECHO_N "checking whether to enable DOM support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable DOM support" >&5
+$as_echo_n "checking whether to enable DOM support... " >&6; }
 # Check whether --enable-dom was given.
-if test "${enable_dom+set}" = set; then
+if test "${enable_dom+set}" = set; then :
   enableval=$enable_dom; PHP_DOM=$enableval
 else
 
@@ -44711,8 +33869,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -44721,11 +33879,11 @@ if test -z "$PHP_LIBXML_DIR"; then
 
 php_with_libxml_dir=no
 
-{ echo "$as_me:$LINENO: checking libxml2 install dir" >&5
-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml2 install dir" >&5
+$as_echo_n "checking libxml2 install dir... " >&6; }
 
 # Check whether --with-libxml-dir was given.
-if test "${with_libxml_dir+set}" = set; then
+if test "${with_libxml_dir+set}" = set; then :
   withval=$with_libxml_dir; PHP_LIBXML_DIR=$withval
 else
 
@@ -44736,8 +33894,8 @@ fi
 
 
 ext_output=$PHP_LIBXML_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -44746,16 +33904,14 @@ fi
 if test "$PHP_DOM" != "no"; then
 
   if test "$PHP_LIBXML" = "no"; then
-    { { echo "$as_me:$LINENO: error: DOM extension requires LIBXML extension, add --enable-libxml" >&5
-echo "$as_me: error: DOM extension requires LIBXML extension, add --enable-libxml" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "DOM extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5
   fi
 
 
-{ echo "$as_me:$LINENO: checking for xml2-config path" >&5
-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6; }
-if test "${ac_cv_php_xml2_config_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5
+$as_echo_n "checking for xml2-config path... " >&6; }
+if test "${ac_cv_php_xml2_config_path+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
   for i in $PHP_LIBXML_DIR /usr/local /usr; do
@@ -44766,8 +33922,8 @@ else
   done
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5
-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_xml2_config_path" >&5
+$as_echo "$ac_cv_php_xml2_config_path" >&6; }
 
   if test -x "$ac_cv_php_xml2_config_path"; then
     XML2_CONFIG="$ac_cv_php_xml2_config_path"
@@ -44834,10 +33990,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -44881,10 +34037,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -44910,10 +34066,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
   done
 
 
-            { echo "$as_me:$LINENO: checking whether libxml build works" >&5
-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6; }
-if test "${php_cv_libxml_build_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5
+$as_echo_n "checking whether libxml build works... " >&6; }
+if test "${php_cv_libxml_build_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -44921,16 +34077,12 @@ else
   LIBS="
           $DOM_SHARED_LIBADD
          $LIBS"
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
     LIBS=$old_LIBS
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -44941,26 +34093,7 @@ cat >>conftest.$ac_ext <<_ACEOF
     }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     LIBS=$old_LIBS
 
@@ -44968,43 +34101,32 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     LIBS=$old_LIBS
 
-          { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-          { { echo "$as_me:$LINENO: error: build test failed.  Please check the config.log for details." >&5
-echo "$as_me: error: build test failed.  Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          as_fn_error "build test failed.  Please check the config.log for details." "$LINENO" 5
 
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
 
-
 fi
-{ echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5
-echo "${ECHO_T}$php_cv_libxml_build_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_libxml_build_works" >&5
+$as_echo "$php_cv_libxml_build_works" >&6; }
       if test "$php_cv_libxml_build_works" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBXML 1
-_ACEOF
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
       fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DOM 1
-_ACEOF
+$as_echo "#define HAVE_DOM 1" >>confdefs.h
 
 
   ext_builddir=ext/dom
@@ -45361,42 +34483,26 @@ EOF
   is_it_shared=$PHP_LIBXML_SHARED
   is_it_enabled=$PHP_LIBXML
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension dom to build statically, but it
 depends on extension libxml, which you've configured to build shared.
 You either need to build dom shared or build libxml statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension dom to build statically, but it
-depends on extension libxml, which you've configured to build shared.
-You either need to build dom shared or build libxml statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension dom, which depends on extension libxml,
-but you've either not enabled libxml, or have disabled it.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension dom, which depends on extension libxml,
 but you've either not enabled libxml, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 
     else
-      { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5
-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "libxml2 version 2.6.11 or greater required." "$LINENO" 5
     fi
 else
-    { { echo "$as_me:$LINENO: error: xml2-config not found. Please check your libxml2 installation." >&5
-echo "$as_me: error: xml2-config not found. Please check your libxml2 installation." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5
 
   fi
 
@@ -45406,11 +34512,11 @@ fi
 
 php_with_enchant=no
 
-{ echo "$as_me:$LINENO: checking for ENCHANT support" >&5
-echo $ECHO_N "checking for ENCHANT support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ENCHANT support" >&5
+$as_echo_n "checking for ENCHANT support... " >&6; }
 
 # Check whether --with-enchant was given.
-if test "${with_enchant+set}" = set; then
+if test "${with_enchant+set}" = set; then :
   withval=$with_enchant; PHP_ENCHANT=$withval
 else
 
@@ -45442,8 +34548,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -45758,17 +34864,13 @@ EOF
 	done
 
 	if test -z "$ENCHANT_DIR"; then
-		{ { echo "$as_me:$LINENO: error: Cannot find enchant" >&5
-echo "$as_me: error: Cannot find enchant" >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error "Cannot find enchant" "$LINENO" 5
 	fi
 
 	ENCHANT_LIBDIR=$ENCHANT_DIR/lib
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ENCHANT 1
-_ACEOF
+$as_echo "#define HAVE_ENCHANT 1" >>confdefs.h
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST ENCHANT_SHARED_LIBADD"
@@ -45785,10 +34887,10 @@ _ACEOF
     ai_p=$ENCHANT_LIBDIR
   else
 
-    ep_dir="`echo $ENCHANT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ENCHANT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ENCHANT_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ENCHANT_LIBDIR"`
   fi
 
 
@@ -45828,10 +34930,10 @@ _ACEOF
     ai_p=$ENCHANT_LIBDIR
   else
 
-    ep_dir="`echo $ENCHANT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ENCHANT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ENCHANT_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ENCHANT_LIBDIR"`
   fi
 
 
@@ -45877,10 +34979,10 @@ _ACEOF
     ai_p=$ENCHANT_INCDIR
   else
 
-    ep_dir="`echo $ENCHANT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ENCHANT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ENCHANT_INCDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ENCHANT_INCDIR"`
   fi
 
 
@@ -45961,10 +35063,10 @@ _ACEOF
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -45996,18 +35098,14 @@ _ACEOF
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for enchant_broker_set_param in -lenchant" >&5
-echo $ECHO_N "checking for enchant_broker_set_param in -lenchant... $ECHO_C" >&6; }
-if test "${ac_cv_lib_enchant_enchant_broker_set_param+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for enchant_broker_set_param in -lenchant" >&5
+$as_echo_n "checking for enchant_broker_set_param in -lenchant... " >&6; }
+if test "${ac_cv_lib_enchant_enchant_broker_set_param+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lenchant  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -46025,52 +35123,27 @@ return enchant_broker_set_param ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_enchant_enchant_broker_set_param=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_enchant_enchant_broker_set_param=no
+  ac_cv_lib_enchant_enchant_broker_set_param=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_enchant_enchant_broker_set_param" >&5
-echo "${ECHO_T}$ac_cv_lib_enchant_enchant_broker_set_param" >&6; }
-if test $ac_cv_lib_enchant_enchant_broker_set_param = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_enchant_enchant_broker_set_param" >&5
+$as_echo "$ac_cv_lib_enchant_enchant_broker_set_param" >&6; }
+if test "x$ac_cv_lib_enchant_enchant_broker_set_param" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ENCHANT_BROKER_SET_PARAM 1
-_ACEOF
+$as_echo "#define HAVE_ENCHANT_BROKER_SET_PARAM 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define ENCHANT_VERSION_STRING "1.5.x"
-_ACEOF
+$as_echo "#define ENCHANT_VERSION_STRING \"1.5.x\"" >>confdefs.h
 
 
 
@@ -46090,10 +35163,10 @@ fi
 
 php_enable_exif=no
 
-{ echo "$as_me:$LINENO: checking whether to enable EXIF (metadata from images) support" >&5
-echo $ECHO_N "checking whether to enable EXIF (metadata from images) support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable EXIF (metadata from images) support" >&5
+$as_echo_n "checking whether to enable EXIF (metadata from images) support... " >&6; }
 # Check whether --enable-exif was given.
-if test "${enable_exif+set}" = set; then
+if test "${enable_exif+set}" = set; then :
   enableval=$enable_exif; PHP_EXIF=$enableval
 else
 
@@ -46125,17 +35198,15 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_EXIF" != "no"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_EXIF 1
-_ACEOF
+$as_echo "#define HAVE_EXIF 1" >>confdefs.h
 
 
   ext_builddir=ext/exif
@@ -46436,10 +35507,10 @@ fi
 
 php_enable_fileinfo=yes
 
-{ echo "$as_me:$LINENO: checking for fileinfo support" >&5
-echo $ECHO_N "checking for fileinfo support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fileinfo support" >&5
+$as_echo_n "checking for fileinfo support... " >&6; }
 # Check whether --enable-fileinfo was given.
-if test "${enable_fileinfo+set}" = set; then
+if test "${enable_fileinfo+set}" = set; then :
   enableval=$enable_fileinfo; PHP_FILEINFO=$enableval
 else
 
@@ -46471,8 +35542,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -46785,96 +35856,14 @@ EOF
 
 
 
-
-
-for ac_func in utimes strndup
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+  for ac_func in utimes strndup
+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"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -46893,10 +35882,10 @@ fi
 
 php_enable_filter=yes
 
-{ echo "$as_me:$LINENO: checking whether to enable input filter support" >&5
-echo $ECHO_N "checking whether to enable input filter support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable input filter support" >&5
+$as_echo_n "checking whether to enable input filter support... " >&6; }
 # Check whether --enable-filter was given.
-if test "${enable_filter+set}" = set; then
+if test "${enable_filter+set}" = set; then :
   enableval=$enable_filter; PHP_FILTER=$enableval
 else
 
@@ -46928,8 +35917,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -46937,11 +35926,11 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_with_pcre_dir=no
 
-{ echo "$as_me:$LINENO: checking pcre install prefix" >&5
-echo $ECHO_N "checking pcre install prefix... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pcre install prefix" >&5
+$as_echo_n "checking pcre install prefix... " >&6; }
 
 # Check whether --with-pcre-dir was given.
-if test "${with_pcre_dir+set}" = set; then
+if test "${with_pcre_dir+set}" = set; then :
   withval=$with_pcre_dir; PHP_PCRE_DIR=$withval
 else
 
@@ -46952,8 +35941,8 @@ fi
 
 
 ext_output=$PHP_PCRE_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -46965,11 +35954,7 @@ if test "$PHP_FILTER" != "no"; then
   else
         old_CPPFLAGS=$CPPFLAGS
     CPPFLAGS=$INCLUDES
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <main/php_config.h>
@@ -46979,17 +35964,13 @@ 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 :
 
       PHP_PCRE_REGEX=yes
 
 else
 
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <main/php_config.h>
@@ -46999,7 +35980,7 @@ 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 :
 
         PHP_PCRE_REGEX=pecl
 
@@ -47008,11 +35989,11 @@ else
         PHP_PCRE_REGEX=no
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
     CPPFLAGS=$old_CPPFLAGS
   fi
@@ -47337,30 +36318,18 @@ EOF
   is_it_shared=$PHP_PCRE_SHARED
   is_it_enabled=$PHP_PCRE
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension filter to build statically, but it
-depends on extension pcre, which you've configured to build shared.
-You either need to build filter shared or build pcre statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension filter to build statically, but it
 depends on extension pcre, which you've configured to build shared.
 You either need to build filter shared or build pcre statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension filter, which depends on extension pcre,
-but you've either not enabled pcre, or have disabled it.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension filter, which depends on extension pcre,
 but you've either not enabled pcre, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 fi
@@ -47369,10 +36338,10 @@ fi
 
 php_enable_ftp=no
 
-{ echo "$as_me:$LINENO: checking whether to enable FTP support" >&5
-echo $ECHO_N "checking whether to enable FTP support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable FTP support" >&5
+$as_echo_n "checking whether to enable FTP support... " >&6; }
 # Check whether --enable-ftp was given.
-if test "${enable_ftp+set}" = set; then
+if test "${enable_ftp+set}" = set; then :
   enableval=$enable_ftp; PHP_FTP=$enableval
 else
 
@@ -47404,8 +36373,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -47413,11 +36382,11 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_with_openssl_dir=no
 
-{ echo "$as_me:$LINENO: checking OpenSSL dir for FTP" >&5
-echo $ECHO_N "checking OpenSSL dir for FTP... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenSSL dir for FTP" >&5
+$as_echo_n "checking OpenSSL dir for FTP... " >&6; }
 
 # Check whether --with-openssl-dir was given.
-if test "${with_openssl_dir+set}" = set; then
+if test "${with_openssl_dir+set}" = set; then :
   withval=$with_openssl_dir; PHP_OPENSSL_DIR=$withval
 else
 
@@ -47428,17 +36397,15 @@ fi
 
 
 ext_output=$PHP_OPENSSL_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_FTP" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FTP 1
-_ACEOF
+$as_echo "#define HAVE_FTP 1" >>confdefs.h
 
 
   ext_builddir=ext/ftp
@@ -47754,10 +36721,10 @@ EOF
     if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -47769,14 +36736,14 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
@@ -47785,11 +36752,11 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -47802,9 +36769,7 @@ fi
       OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl`
       OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl`
     else
-      { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5
-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "OpenSSL version 0.9.6 or greater required." "$LINENO" 5
     fi
 
     if test -n "$OPENSSL_LIBS"; then
@@ -47862,10 +36827,10 @@ echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -47911,10 +36876,10 @@ echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -47959,26 +36924,18 @@ echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
     done
 
     if test -z "$OPENSSL_INCDIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's <evp.h>" >&5
-echo "$as_me: error: Cannot find OpenSSL's <evp.h>" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Cannot find OpenSSL's <evp.h>" "$LINENO" 5
     fi
 
     if test -z "$OPENSSL_LIBDIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's libraries" >&5
-echo "$as_me: error: Cannot find OpenSSL's libraries" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Cannot find OpenSSL's libraries" "$LINENO" 5
     fi
 
     old_CPPFLAGS=$CPPFLAGS
     CPPFLAGS=-I$OPENSSL_INCDIR
-    { echo "$as_me:$LINENO: checking for OpenSSL version" >&5
-echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6; }
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL version" >&5
+$as_echo_n "checking for OpenSSL version... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <openssl/opensslv.h>
@@ -47988,19 +36945,17 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
+  $EGREP "yes" >/dev/null 2>&1; then :
 
-      { echo "$as_me:$LINENO: result: >= 0.9.6" >&5
-echo "${ECHO_T}>= 0.9.6" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: >= 0.9.6" >&5
+$as_echo ">= 0.9.6" >&6; }
 
 else
 
-      { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5
-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "OpenSSL version 0.9.6 or greater required." "$LINENO" 5
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
     CPPFLAGS=$old_CPPFLAGS
 
@@ -48011,10 +36966,10 @@ rm -f -r conftest*
     ai_p=$OPENSSL_INCDIR
   else
 
-    ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$OPENSSL_INCDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$OPENSSL_INCDIR"`
   fi
 
 
@@ -48098,10 +37053,10 @@ rm -f -r conftest*
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -48133,18 +37088,14 @@ rm -f -r conftest*
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for CRYPTO_free in -lcrypto" >&5
-echo $ECHO_N "checking for CRYPTO_free in -lcrypto... $ECHO_C" >&6; }
-if test "${ac_cv_lib_crypto_CRYPTO_free+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CRYPTO_free in -lcrypto" >&5
+$as_echo_n "checking for CRYPTO_free in -lcrypto... " >&6; }
+if test "${ac_cv_lib_crypto_CRYPTO_free+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypto  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -48162,39 +37113,18 @@ return CRYPTO_free ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_crypto_CRYPTO_free=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_crypto_CRYPTO_free=no
+  ac_cv_lib_crypto_CRYPTO_free=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_free" >&5
-echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_free" >&6; }
-if test $ac_cv_lib_crypto_CRYPTO_free = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_CRYPTO_free" >&5
+$as_echo "$ac_cv_lib_crypto_CRYPTO_free" >&6; }
+if test "x$ac_cv_lib_crypto_CRYPTO_free" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -48230,9 +37160,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_crypto_CRYPTO_free
 
-      { { echo "$as_me:$LINENO: error: libcrypto not found!" >&5
-echo "$as_me: error: libcrypto not found!" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "libcrypto not found!" "$LINENO" 5
 
 
 fi
@@ -48302,10 +37230,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -48337,18 +37265,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for SSL_CTX_set_ssl_version in -lssl" >&5
-echo $ECHO_N "checking for SSL_CTX_set_ssl_version in -lssl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_set_ssl_version in -lssl" >&5
+$as_echo_n "checking for SSL_CTX_set_ssl_version in -lssl... " >&6; }
+if test "${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lssl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -48366,39 +37290,18 @@ return SSL_CTX_set_ssl_version ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ssl_SSL_CTX_set_ssl_version=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_ssl_SSL_CTX_set_ssl_version=no
+  ac_cv_lib_ssl_SSL_CTX_set_ssl_version=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&5
-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&6; }
-if test $ac_cv_lib_ssl_SSL_CTX_set_ssl_version = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&5
+$as_echo "$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&6; }
+if test "x$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -48412,9 +37315,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version
 
-      { { echo "$as_me:$LINENO: error: libssl not found!" >&5
-echo "$as_me: error: libssl not found!" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "libssl not found!" "$LINENO" 5
 
 
 fi
@@ -48474,10 +37375,10 @@ fi
     ai_p=$OPENSSL_LIBDIR
   else
 
-    ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$OPENSSL_LIBDIR"`
   fi
 
 
@@ -48526,11 +37427,11 @@ fi
 
 php_with_gd=no
 
-{ echo "$as_me:$LINENO: checking for GD support" >&5
-echo $ECHO_N "checking for GD support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GD support" >&5
+$as_echo_n "checking for GD support... " >&6; }
 
 # Check whether --with-gd was given.
-if test "${with_gd+set}" = set; then
+if test "${with_gd+set}" = set; then :
   withval=$with_gd; PHP_GD=$withval
 else
 
@@ -48562,8 +37463,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -48572,11 +37473,11 @@ if test -z "$PHP_VPX_DIR"; then
 
 php_with_vpx_dir=no
 
-{ echo "$as_me:$LINENO: checking for the location of libvpx" >&5
-echo $ECHO_N "checking for the location of libvpx... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libvpx" >&5
+$as_echo_n "checking for the location of libvpx... " >&6; }
 
 # Check whether --with-vpx-dir was given.
-if test "${with_vpx_dir+set}" = set; then
+if test "${with_vpx_dir+set}" = set; then :
   withval=$with_vpx_dir; PHP_VPX_DIR=$withval
 else
 
@@ -48587,8 +37488,8 @@ fi
 
 
 ext_output=$PHP_VPX_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -48598,11 +37499,11 @@ if test -z "$PHP_JPEG_DIR"; then
 
 php_with_jpeg_dir=no
 
-{ echo "$as_me:$LINENO: checking for the location of libjpeg" >&5
-echo $ECHO_N "checking for the location of libjpeg... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libjpeg" >&5
+$as_echo_n "checking for the location of libjpeg... " >&6; }
 
 # Check whether --with-jpeg-dir was given.
-if test "${with_jpeg_dir+set}" = set; then
+if test "${with_jpeg_dir+set}" = set; then :
   withval=$with_jpeg_dir; PHP_JPEG_DIR=$withval
 else
 
@@ -48613,8 +37514,8 @@ fi
 
 
 ext_output=$PHP_JPEG_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -48624,11 +37525,11 @@ if test -z "$PHP_PNG_DIR"; then
 
 php_with_png_dir=no
 
-{ echo "$as_me:$LINENO: checking for the location of libpng" >&5
-echo $ECHO_N "checking for the location of libpng... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libpng" >&5
+$as_echo_n "checking for the location of libpng... " >&6; }
 
 # Check whether --with-png-dir was given.
-if test "${with_png_dir+set}" = set; then
+if test "${with_png_dir+set}" = set; then :
   withval=$with_png_dir; PHP_PNG_DIR=$withval
 else
 
@@ -48639,8 +37540,8 @@ fi
 
 
 ext_output=$PHP_PNG_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -48650,11 +37551,11 @@ if test -z "$PHP_ZLIB_DIR"; then
 
 php_with_zlib_dir=no
 
-{ echo "$as_me:$LINENO: checking for the location of libz" >&5
-echo $ECHO_N "checking for the location of libz... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libz" >&5
+$as_echo_n "checking for the location of libz... " >&6; }
 
 # Check whether --with-zlib-dir was given.
-if test "${with_zlib_dir+set}" = set; then
+if test "${with_zlib_dir+set}" = set; then :
   withval=$with_zlib_dir; PHP_ZLIB_DIR=$withval
 else
 
@@ -48665,8 +37566,8 @@ fi
 
 
 ext_output=$PHP_ZLIB_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -48675,11 +37576,11 @@ fi
 
 php_with_xpm_dir=no
 
-{ echo "$as_me:$LINENO: checking for the location of libXpm" >&5
-echo $ECHO_N "checking for the location of libXpm... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libXpm" >&5
+$as_echo_n "checking for the location of libXpm... " >&6; }
 
 # Check whether --with-xpm-dir was given.
-if test "${with_xpm_dir+set}" = set; then
+if test "${with_xpm_dir+set}" = set; then :
   withval=$with_xpm_dir; PHP_XPM_DIR=$withval
 else
 
@@ -48690,8 +37591,8 @@ fi
 
 
 ext_output=$PHP_XPM_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -48699,11 +37600,11 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_with_freetype_dir=no
 
-{ echo "$as_me:$LINENO: checking for FreeType 2" >&5
-echo $ECHO_N "checking for FreeType 2... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FreeType 2" >&5
+$as_echo_n "checking for FreeType 2... " >&6; }
 
 # Check whether --with-freetype-dir was given.
-if test "${with_freetype_dir+set}" = set; then
+if test "${with_freetype_dir+set}" = set; then :
   withval=$with_freetype_dir; PHP_FREETYPE_DIR=$withval
 else
 
@@ -48714,8 +37615,8 @@ fi
 
 
 ext_output=$PHP_FREETYPE_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -48723,11 +37624,11 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_with_t1lib=no
 
-{ echo "$as_me:$LINENO: checking for T1lib support" >&5
-echo $ECHO_N "checking for T1lib support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for T1lib support" >&5
+$as_echo_n "checking for T1lib support... " >&6; }
 
 # Check whether --with-t1lib was given.
-if test "${with_t1lib+set}" = set; then
+if test "${with_t1lib+set}" = set; then :
   withval=$with_t1lib; PHP_T1LIB=$withval
 else
 
@@ -48738,8 +37639,8 @@ fi
 
 
 ext_output=$PHP_T1LIB
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -48747,10 +37648,10 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_enable_gd_native_ttf=no
 
-{ echo "$as_me:$LINENO: checking whether to enable truetype string function in GD" >&5
-echo $ECHO_N "checking whether to enable truetype string function in GD... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable truetype string function in GD" >&5
+$as_echo_n "checking whether to enable truetype string function in GD... " >&6; }
 # Check whether --enable-gd-native-ttf was given.
-if test "${enable_gd_native_ttf+set}" = set; then
+if test "${enable_gd_native_ttf+set}" = set; then :
   enableval=$enable_gd_native_ttf; PHP_GD_NATIVE_TTF=$enableval
 else
 
@@ -48761,8 +37662,8 @@ fi
 
 
 ext_output=$PHP_GD_NATIVE_TTF
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -48770,10 +37671,10 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_enable_gd_jis_conv=no
 
-{ echo "$as_me:$LINENO: checking whether to enable JIS-mapped Japanese font support in GD" >&5
-echo $ECHO_N "checking whether to enable JIS-mapped Japanese font support in GD... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable JIS-mapped Japanese font support in GD" >&5
+$as_echo_n "checking whether to enable JIS-mapped Japanese font support in GD... " >&6; }
 # Check whether --enable-gd-jis-conv was given.
-if test "${enable_gd_jis_conv+set}" = set; then
+if test "${enable_gd_jis_conv+set}" = set; then :
   enableval=$enable_gd_jis_conv; PHP_GD_JIS_CONV=$enableval
 else
 
@@ -48784,8 +37685,8 @@ fi
 
 
 ext_output=$PHP_GD_JIS_CONV
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -48822,96 +37723,14 @@ if test "$PHP_GD" = "yes"; then
                  libgd/gd_topal.c libgd/gd_gif_in.c libgd/xbm.c libgd/gd_gif_out.c libgd/gd_security.c \
                  libgd/gd_filter.c libgd/gd_pixelate.c libgd/gd_arc.c libgd/gd_rotate.c libgd/gd_color.c"
 
-
-
-for ac_func in fabsf floorf
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+  for ac_func in fabsf floorf
+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"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -48929,9 +37748,7 @@ done
 			PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
 			PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
 		else
-			{ { echo "$as_me:$LINENO: error: Can't find zlib headers under \"$PHP_ZLIB_DIR\"" >&5
-echo "$as_me: error: Can't find zlib headers under \"$PHP_ZLIB_DIR\"" >&2;}
-   { (exit 1); exit 1; }; }
+			as_fn_error "Can't find zlib headers under \"$PHP_ZLIB_DIR\"" "$LINENO" 5
 		fi
 	else
 		for i in /usr/local /usr; do
@@ -48948,9 +37765,7 @@ echo "$as_me: error: Can't find zlib headers under \"$PHP_ZLIB_DIR\"" >&2;}
 
   if test "$PHP_GD_NATIVE_TTF" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_GD_IMGSTRTTF 1
-_ACEOF
+$as_echo "#define USE_GD_IMGSTRTTF 1" >>confdefs.h
 
   fi
 
@@ -48967,9 +37782,7 @@ _ACEOF
     done
 
     if test -z "$GD_JPEG_DIR"; then
-      { { echo "$as_me:$LINENO: error: jpeglib.h not found." >&5
-echo "$as_me: error: jpeglib.h not found." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "jpeglib.h not found." "$LINENO" 5
     fi
 
 
@@ -49034,10 +37847,10 @@ echo "$as_me: error: jpeglib.h not found." >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -49069,18 +37882,14 @@ echo "$as_me: error: jpeglib.h not found." >&2;}
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for jpeg_read_header in -ljpeg" >&5
-echo $ECHO_N "checking for jpeg_read_header in -ljpeg... $ECHO_C" >&6; }
-if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_read_header in -ljpeg" >&5
+$as_echo_n "checking for jpeg_read_header in -ljpeg... " >&6; }
+if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljpeg  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -49098,39 +37907,18 @@ return jpeg_read_header ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_jpeg_jpeg_read_header=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_jpeg_jpeg_read_header=no
+  ac_cv_lib_jpeg_jpeg_read_header=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5
-echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_read_header" >&6; }
-if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5
+$as_echo "$ac_cv_lib_jpeg_jpeg_read_header" >&6; }
+if test "x$ac_cv_lib_jpeg_jpeg_read_header" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -49142,10 +37930,10 @@ if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then
     ai_p=$GD_JPEG_DIR/include
   else
 
-    ep_dir="`echo $GD_JPEG_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_JPEG_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_JPEG_DIR/include"`
   fi
 
 
@@ -49178,10 +37966,10 @@ if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then
     ai_p=$GD_JPEG_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_JPEG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_JPEG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_JPEG_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -49221,10 +38009,10 @@ if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then
     ai_p=$GD_JPEG_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_JPEG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_JPEG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_JPEG_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -49271,16 +38059,14 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_jpeg_jpeg_read_header
 
-      { { echo "$as_me:$LINENO: error: Problem with libjpeg.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with libjpeg.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Problem with libjpeg.(a|so). Please check config.log for more information." "$LINENO" 5
 
 
 fi
 
   else
-    { echo "$as_me:$LINENO: result: If configure fails try --with-jpeg-dir=<DIR>" >&5
-echo "${ECHO_T}If configure fails try --with-jpeg-dir=<DIR>" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: If configure fails try --with-jpeg-dir=<DIR>" >&5
+$as_echo "If configure fails try --with-jpeg-dir=<DIR>" >&6; }
   fi
 
 
@@ -49291,9 +38077,7 @@ echo "${ECHO_T}If configure fails try --with-jpeg-dir=<DIR>" >&6; }
     done
 
     if test -z "$GD_VPX_DIR"; then
-      { { echo "$as_me:$LINENO: error: vpx_codec.h not found." >&5
-echo "$as_me: error: vpx_codec.h not found." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "vpx_codec.h not found." "$LINENO" 5
     fi
 
 
@@ -49358,10 +38142,10 @@ echo "$as_me: error: vpx_codec.h not found." >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -49393,18 +38177,14 @@ echo "$as_me: error: vpx_codec.h not found." >&2;}
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for vpx_codec_destroy in -lvpx" >&5
-echo $ECHO_N "checking for vpx_codec_destroy in -lvpx... $ECHO_C" >&6; }
-if test "${ac_cv_lib_vpx_vpx_codec_destroy+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vpx_codec_destroy in -lvpx" >&5
+$as_echo_n "checking for vpx_codec_destroy in -lvpx... " >&6; }
+if test "${ac_cv_lib_vpx_vpx_codec_destroy+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lvpx  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -49422,39 +38202,18 @@ return vpx_codec_destroy ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_vpx_vpx_codec_destroy=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_vpx_vpx_codec_destroy=no
+  ac_cv_lib_vpx_vpx_codec_destroy=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_vpx_vpx_codec_destroy" >&5
-echo "${ECHO_T}$ac_cv_lib_vpx_vpx_codec_destroy" >&6; }
-if test $ac_cv_lib_vpx_vpx_codec_destroy = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vpx_vpx_codec_destroy" >&5
+$as_echo "$ac_cv_lib_vpx_vpx_codec_destroy" >&6; }
+if test "x$ac_cv_lib_vpx_vpx_codec_destroy" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -49466,10 +38225,10 @@ if test $ac_cv_lib_vpx_vpx_codec_destroy = yes; then
     ai_p=$GD_VPX_DIR/include
   else
 
-    ep_dir="`echo $GD_VPX_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_VPX_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_VPX_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_VPX_DIR/include"`
   fi
 
 
@@ -49512,10 +38271,10 @@ if test $ac_cv_lib_vpx_vpx_codec_destroy = yes; then
     ai_p=$GD_VPX_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_VPX_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_VPX_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_VPX_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_VPX_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -49555,10 +38314,10 @@ if test $ac_cv_lib_vpx_vpx_codec_destroy = yes; then
     ai_p=$GD_VPX_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_VPX_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_VPX_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_VPX_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_VPX_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -49605,16 +38364,14 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_vpx_vpx_codec_destroy
 
-      { { echo "$as_me:$LINENO: error: Problem with libvpx.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with libvpx.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Problem with libvpx.(a|so). Please check config.log for more information." "$LINENO" 5
 
 
 fi
 
   else
-    { echo "$as_me:$LINENO: result: If configure fails try --with-vpx-dir=<DIR>" >&5
-echo "${ECHO_T}If configure fails try --with-vpx-dir=<DIR>" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: If configure fails try --with-vpx-dir=<DIR>" >&5
+$as_echo "If configure fails try --with-vpx-dir=<DIR>" >&6; }
   fi
 
 
@@ -49625,15 +38382,11 @@ echo "${ECHO_T}If configure fails try --with-vpx-dir=<DIR>" >&6; }
     done
 
     if test -z "$GD_PNG_DIR"; then
-      { { echo "$as_me:$LINENO: error: png.h not found." >&5
-echo "$as_me: error: png.h not found." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "png.h not found." "$LINENO" 5
     fi
 
     if test "$PHP_ZLIB_DIR" = "no"; then
-      { { echo "$as_me:$LINENO: error: PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" >&5
-echo "$as_me: error: PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" "$LINENO" 5
     fi
 
 
@@ -49698,10 +38451,10 @@ echo "$as_me: error: PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -49733,18 +38486,14 @@ echo "$as_me: error: PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" >&2;}
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for png_write_image in -lpng" >&5
-echo $ECHO_N "checking for png_write_image in -lpng... $ECHO_C" >&6; }
-if test "${ac_cv_lib_png_png_write_image+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_write_image in -lpng" >&5
+$as_echo_n "checking for png_write_image in -lpng... " >&6; }
+if test "${ac_cv_lib_png_png_write_image+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpng  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -49762,39 +38511,18 @@ return png_write_image ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_png_png_write_image=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_png_png_write_image=no
+  ac_cv_lib_png_png_write_image=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_write_image" >&5
-echo "${ECHO_T}$ac_cv_lib_png_png_write_image" >&6; }
-if test $ac_cv_lib_png_png_write_image = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_write_image" >&5
+$as_echo "$ac_cv_lib_png_png_write_image" >&6; }
+if test "x$ac_cv_lib_png_png_write_image" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -49806,10 +38534,10 @@ if test $ac_cv_lib_png_png_write_image = yes; then
     ai_p=$GD_PNG_DIR/include
   else
 
-    ep_dir="`echo $GD_PNG_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_PNG_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_PNG_DIR/include"`
   fi
 
 
@@ -49842,10 +38570,10 @@ if test $ac_cv_lib_png_png_write_image = yes; then
     ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_ZLIB_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -49885,10 +38613,10 @@ if test $ac_cv_lib_png_png_write_image = yes; then
     ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_ZLIB_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -49939,10 +38667,10 @@ if test $ac_cv_lib_png_png_write_image = yes; then
     ai_p=$GD_PNG_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_PNG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_PNG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_PNG_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -49982,10 +38710,10 @@ if test $ac_cv_lib_png_png_write_image = yes; then
     ai_p=$GD_PNG_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_PNG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_PNG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_PNG_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -50032,17 +38760,15 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_png_png_write_image
 
-      { { echo "$as_me:$LINENO: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." "$LINENO" 5
 
 
 fi
 
 
   else
-    { echo "$as_me:$LINENO: result: If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" >&5
-echo "${ECHO_T}If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" >&5
+$as_echo "If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" >&6; }
   fi
 
 
@@ -50053,9 +38779,7 @@ echo "${ECHO_T}If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<
     done
 
     if test -z "$GD_XPM_DIR"; then
-      { { echo "$as_me:$LINENO: error: libXpm.(a|so) not found." >&5
-echo "$as_me: error: libXpm.(a|so) not found." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "libXpm.(a|so) not found." "$LINENO" 5
     fi
 
     for i in include include/X11; do
@@ -50063,9 +38787,7 @@ echo "$as_me: error: libXpm.(a|so) not found." >&2;}
     done
 
     if test -z "$GD_XPM_INC"; then
-      { { echo "$as_me:$LINENO: error: xpm.h not found." >&5
-echo "$as_me: error: xpm.h not found." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "xpm.h not found." "$LINENO" 5
     fi
 
 
@@ -50130,10 +38852,10 @@ echo "$as_me: error: xpm.h not found." >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -50165,18 +38887,14 @@ echo "$as_me: error: xpm.h not found." >&2;}
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for XpmFreeXpmImage in -lXpm" >&5
-echo $ECHO_N "checking for XpmFreeXpmImage in -lXpm... $ECHO_C" >&6; }
-if test "${ac_cv_lib_Xpm_XpmFreeXpmImage+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmFreeXpmImage in -lXpm" >&5
+$as_echo_n "checking for XpmFreeXpmImage in -lXpm... " >&6; }
+if test "${ac_cv_lib_Xpm_XpmFreeXpmImage+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXpm  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -50194,39 +38912,18 @@ return XpmFreeXpmImage ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_Xpm_XpmFreeXpmImage=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_Xpm_XpmFreeXpmImage=no
+  ac_cv_lib_Xpm_XpmFreeXpmImage=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmFreeXpmImage" >&5
-echo "${ECHO_T}$ac_cv_lib_Xpm_XpmFreeXpmImage" >&6; }
-if test $ac_cv_lib_Xpm_XpmFreeXpmImage = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_XpmFreeXpmImage" >&5
+$as_echo "$ac_cv_lib_Xpm_XpmFreeXpmImage" >&6; }
+if test "x$ac_cv_lib_Xpm_XpmFreeXpmImage" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -50238,10 +38935,10 @@ if test $ac_cv_lib_Xpm_XpmFreeXpmImage = yes; then
     ai_p=$GD_XPM_INC
   else
 
-    ep_dir="`echo $GD_XPM_INC|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_XPM_INC|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_XPM_INC\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_XPM_INC"`
   fi
 
 
@@ -50274,10 +38971,10 @@ if test $ac_cv_lib_Xpm_XpmFreeXpmImage = yes; then
     ai_p=$GD_XPM_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_XPM_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -50317,10 +39014,10 @@ if test $ac_cv_lib_Xpm_XpmFreeXpmImage = yes; then
     ai_p=$GD_XPM_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_XPM_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -50371,10 +39068,10 @@ if test $ac_cv_lib_Xpm_XpmFreeXpmImage = yes; then
     ai_p=$GD_XPM_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_XPM_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -50414,10 +39111,10 @@ if test $ac_cv_lib_Xpm_XpmFreeXpmImage = yes; then
     ai_p=$GD_XPM_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_XPM_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -50464,16 +39161,14 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_Xpm_XpmFreeXpmImage
 
-      { { echo "$as_me:$LINENO: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." "$LINENO" 5
 
 
 fi
 
   else
-    { echo "$as_me:$LINENO: result: If configure fails try --with-xpm-dir=<DIR>" >&5
-echo "${ECHO_T}If configure fails try --with-xpm-dir=<DIR>" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: If configure fails try --with-xpm-dir=<DIR>" >&5
+$as_echo "If configure fails try --with-xpm-dir=<DIR>" >&6; }
   fi
 
 
@@ -50488,9 +39183,7 @@ echo "${ECHO_T}If configure fails try --with-xpm-dir=<DIR>" >&6; }
     done
 
     if test -z "$FREETYPE2_DIR"; then
-      { { echo "$as_me:$LINENO: error: freetype.h not found." >&5
-echo "$as_me: error: freetype.h not found." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "freetype.h not found." "$LINENO" 5
     fi
 
 
@@ -50555,10 +39248,10 @@ echo "$as_me: error: freetype.h not found." >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -50590,18 +39283,14 @@ echo "$as_me: error: freetype.h not found." >&2;}
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for FT_New_Face in -lfreetype" >&5
-echo $ECHO_N "checking for FT_New_Face in -lfreetype... $ECHO_C" >&6; }
-if test "${ac_cv_lib_freetype_FT_New_Face+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_New_Face in -lfreetype" >&5
+$as_echo_n "checking for FT_New_Face in -lfreetype... " >&6; }
+if test "${ac_cv_lib_freetype_FT_New_Face+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfreetype  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -50619,39 +39308,18 @@ return FT_New_Face ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_freetype_FT_New_Face=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_freetype_FT_New_Face=no
+  ac_cv_lib_freetype_FT_New_Face=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_New_Face" >&5
-echo "${ECHO_T}$ac_cv_lib_freetype_FT_New_Face" >&6; }
-if test $ac_cv_lib_freetype_FT_New_Face = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_New_Face" >&5
+$as_echo "$ac_cv_lib_freetype_FT_New_Face" >&6; }
+if test "x$ac_cv_lib_freetype_FT_New_Face" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -50668,10 +39336,10 @@ if test $ac_cv_lib_freetype_FT_New_Face = yes; then
     ai_p=$FREETYPE2_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $FREETYPE2_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $FREETYPE2_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$FREETYPE2_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -50711,10 +39379,10 @@ if test $ac_cv_lib_freetype_FT_New_Face = yes; then
     ai_p=$FREETYPE2_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $FREETYPE2_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $FREETYPE2_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$FREETYPE2_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -50760,10 +39428,10 @@ if test $ac_cv_lib_freetype_FT_New_Face = yes; then
     ai_p=$FREETYPE2_DIR/include
   else
 
-    ep_dir="`echo $FREETYPE2_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $FREETYPE2_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$FREETYPE2_DIR/include"`
   fi
 
 
@@ -50791,10 +39459,10 @@ if test $ac_cv_lib_freetype_FT_New_Face = yes; then
     ai_p=$FREETYPE2_INC_DIR
   else
 
-    ep_dir="`echo $FREETYPE2_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $FREETYPE2_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$FREETYPE2_INC_DIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$FREETYPE2_INC_DIR"`
   fi
 
 
@@ -50816,19 +39484,13 @@ if test $ac_cv_lib_freetype_FT_New_Face = yes; then
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_GD_IMGSTRTTF 1
-_ACEOF
+$as_echo "#define USE_GD_IMGSTRTTF 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBFREETYPE 1
-_ACEOF
+$as_echo "#define HAVE_LIBFREETYPE 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_GD_TTF 1
-_ACEOF
+$as_echo "#define ENABLE_GD_TTF 1" >>confdefs.h
 
 
 
@@ -50838,16 +39500,14 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_freetype_FT_New_Face
 
-      { { echo "$as_me:$LINENO: error: Problem with freetype.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with freetype.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Problem with freetype.(a|so). Please check config.log for more information." "$LINENO" 5
 
 
 fi
 
   else
-    { echo "$as_me:$LINENO: result: If configure fails try --with-freetype-dir=<DIR>" >&5
-echo "${ECHO_T}If configure fails try --with-freetype-dir=<DIR>" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: If configure fails try --with-freetype-dir=<DIR>" >&5
+$as_echo "If configure fails try --with-freetype-dir=<DIR>" >&6; }
   fi
 
 
@@ -50858,9 +39518,7 @@ echo "${ECHO_T}If configure fails try --with-freetype-dir=<DIR>" >&6; }
     done
 
     if test -z "$GD_T1_DIR"; then
-      { { echo "$as_me:$LINENO: error: Your t1lib distribution is not installed correctly. Please reinstall it." >&5
-echo "$as_me: error: Your t1lib distribution is not installed correctly. Please reinstall it." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Your t1lib distribution is not installed correctly. Please reinstall it." "$LINENO" 5
     fi
 
 
@@ -50925,10 +39583,10 @@ echo "$as_me: error: Your t1lib distribution is not installed correctly. Please
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -50960,18 +39618,14 @@ echo "$as_me: error: Your t1lib distribution is not installed correctly. Please
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for T1_StrError in -lt1" >&5
-echo $ECHO_N "checking for T1_StrError in -lt1... $ECHO_C" >&6; }
-if test "${ac_cv_lib_t1_T1_StrError+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for T1_StrError in -lt1" >&5
+$as_echo_n "checking for T1_StrError in -lt1... " >&6; }
+if test "${ac_cv_lib_t1_T1_StrError+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lt1  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -50989,47 +39643,24 @@ return T1_StrError ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_t1_T1_StrError=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_t1_T1_StrError=no
+  ac_cv_lib_t1_T1_StrError=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_t1_T1_StrError" >&5
-echo "${ECHO_T}$ac_cv_lib_t1_T1_StrError" >&6; }
-if test $ac_cv_lib_t1_T1_StrError = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_t1_T1_StrError" >&5
+$as_echo "$ac_cv_lib_t1_T1_StrError" >&6; }
+if test "x$ac_cv_lib_t1_T1_StrError" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBT1 1
-_ACEOF
+$as_echo "#define HAVE_LIBT1 1" >>confdefs.h
 
 
   if test "$GD_T1_DIR/include" != "/usr/include"; then
@@ -51038,10 +39669,10 @@ _ACEOF
     ai_p=$GD_T1_DIR/include
   else
 
-    ep_dir="`echo $GD_T1_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_T1_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_T1_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_T1_DIR/include"`
   fi
 
 
@@ -51074,10 +39705,10 @@ _ACEOF
     ai_p=$GD_T1_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_T1_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_T1_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_T1_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_T1_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -51117,10 +39748,10 @@ _ACEOF
     ai_p=$GD_T1_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_T1_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_T1_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_T1_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_T1_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -51167,9 +39798,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_t1_T1_StrError
 
-      { { echo "$as_me:$LINENO: error: Problem with libt1.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with libt1.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Problem with libt1.(a|so). Please check config.log for more information." "$LINENO" 5
 
 
 fi
@@ -51178,109 +39807,67 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBGD 1
-_ACEOF
+$as_echo "#define HAVE_LIBGD 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBGD13 1
-_ACEOF
+$as_echo "#define HAVE_LIBGD13 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBGD15 1
-_ACEOF
+$as_echo "#define HAVE_LIBGD15 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBGD20 1
-_ACEOF
+$as_echo "#define HAVE_LIBGD20 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBGD204 1
-_ACEOF
+$as_echo "#define HAVE_LIBGD204 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_IMAGESETTILE 1
-_ACEOF
+$as_echo "#define HAVE_GD_IMAGESETTILE 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_IMAGESETBRUSH 1
-_ACEOF
+$as_echo "#define HAVE_GD_IMAGESETBRUSH 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GDIMAGECOLORRESOLVE 1
-_ACEOF
+$as_echo "#define HAVE_GDIMAGECOLORRESOLVE 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_COLORCLOSESTHWB 1
-_ACEOF
+$as_echo "#define HAVE_COLORCLOSESTHWB 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_WBMP 1
-_ACEOF
+$as_echo "#define HAVE_GD_WBMP 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_GD2 1
-_ACEOF
+$as_echo "#define HAVE_GD_GD2 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_PNG 1
-_ACEOF
+$as_echo "#define HAVE_GD_PNG 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_XBM 1
-_ACEOF
+$as_echo "#define HAVE_GD_XBM 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_BUNDLED 1
-_ACEOF
+$as_echo "#define HAVE_GD_BUNDLED 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_GIF_READ 1
-_ACEOF
+$as_echo "#define HAVE_GD_GIF_READ 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_GIF_CREATE 1
-_ACEOF
+$as_echo "#define HAVE_GD_GIF_CREATE 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_IMAGEELLIPSE 1
-_ACEOF
+$as_echo "#define HAVE_GD_IMAGEELLIPSE 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_FONTCACHESHUTDOWN 1
-_ACEOF
+$as_echo "#define HAVE_GD_FONTCACHESHUTDOWN 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_FONTMUTEX 1
-_ACEOF
+$as_echo "#define HAVE_GD_FONTMUTEX 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_DYNAMIC_CTX_EX 1
-_ACEOF
+$as_echo "#define HAVE_GD_DYNAMIC_CTX_EX 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_GIF_CTX 1
-_ACEOF
+$as_echo "#define HAVE_GD_GIF_CTX 1" >>confdefs.h
 
 
   GDLIB_CFLAGS="-DHAVE_LIBPNG"
@@ -51288,55 +39875,41 @@ _ACEOF
 
   if test -n "$GD_VPX_DIR"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_WEBP 1
-_ACEOF
+$as_echo "#define HAVE_GD_WEBP 1" >>confdefs.h
 
     GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBVPX"
   fi
 
   if test -n "$GD_JPEG_DIR"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_JPG 1
-_ACEOF
+$as_echo "#define HAVE_GD_JPG 1" >>confdefs.h
 
     GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBJPEG"
   fi
 
   if test -n "$GD_XPM_DIR"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_XPM 1
-_ACEOF
+$as_echo "#define HAVE_GD_XPM 1" >>confdefs.h
 
     GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_XPM"
   fi
 
   if test -n "$FREETYPE2_DIR"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_STRINGFT 1
-_ACEOF
+$as_echo "#define HAVE_GD_STRINGFT 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_STRINGFTEX 1
-_ACEOF
+$as_echo "#define HAVE_GD_STRINGFTEX 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_GD_TTF 1
-_ACEOF
+$as_echo "#define ENABLE_GD_TTF 1" >>confdefs.h
 
     GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBFREETYPE -DENABLE_GD_TTF"
   fi
 
   if test -n "$USE_GD_JIS_CONV"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_GD_JISX0208 1
-_ACEOF
+$as_echo "#define USE_GD_JISX0208 1" >>confdefs.h
 
     GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"
   fi
@@ -51357,9 +39930,7 @@ else
 			PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
 			PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
 		else
-			{ { echo "$as_me:$LINENO: error: Can't find zlib headers under \"$PHP_ZLIB_DIR\"" >&5
-echo "$as_me: error: Can't find zlib headers under \"$PHP_ZLIB_DIR\"" >&2;}
-   { (exit 1); exit 1; }; }
+			as_fn_error "Can't find zlib headers under \"$PHP_ZLIB_DIR\"" "$LINENO" 5
 		fi
 	else
 		for i in /usr/local /usr; do
@@ -51376,9 +39947,7 @@ echo "$as_me: error: Can't find zlib headers under \"$PHP_ZLIB_DIR\"" >&2;}
 
   if test "$PHP_GD_NATIVE_TTF" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_GD_IMGSTRTTF 1
-_ACEOF
+$as_echo "#define USE_GD_IMGSTRTTF 1" >>confdefs.h
 
   fi
 
@@ -51390,9 +39959,7 @@ _ACEOF
     done
 
     if test -z "$GD_VPX_DIR"; then
-      { { echo "$as_me:$LINENO: error: vpx_codec.h not found." >&5
-echo "$as_me: error: vpx_codec.h not found." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "vpx_codec.h not found." "$LINENO" 5
     fi
 
 
@@ -51457,10 +40024,10 @@ echo "$as_me: error: vpx_codec.h not found." >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -51492,18 +40059,14 @@ echo "$as_me: error: vpx_codec.h not found." >&2;}
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for vpx_codec_destroy in -lvpx" >&5
-echo $ECHO_N "checking for vpx_codec_destroy in -lvpx... $ECHO_C" >&6; }
-if test "${ac_cv_lib_vpx_vpx_codec_destroy+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vpx_codec_destroy in -lvpx" >&5
+$as_echo_n "checking for vpx_codec_destroy in -lvpx... " >&6; }
+if test "${ac_cv_lib_vpx_vpx_codec_destroy+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lvpx  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -51521,39 +40084,18 @@ return vpx_codec_destroy ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_vpx_vpx_codec_destroy=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_vpx_vpx_codec_destroy=no
+  ac_cv_lib_vpx_vpx_codec_destroy=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_vpx_vpx_codec_destroy" >&5
-echo "${ECHO_T}$ac_cv_lib_vpx_vpx_codec_destroy" >&6; }
-if test $ac_cv_lib_vpx_vpx_codec_destroy = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vpx_vpx_codec_destroy" >&5
+$as_echo "$ac_cv_lib_vpx_vpx_codec_destroy" >&6; }
+if test "x$ac_cv_lib_vpx_vpx_codec_destroy" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -51565,10 +40107,10 @@ if test $ac_cv_lib_vpx_vpx_codec_destroy = yes; then
     ai_p=$GD_VPX_DIR/include
   else
 
-    ep_dir="`echo $GD_VPX_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_VPX_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_VPX_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_VPX_DIR/include"`
   fi
 
 
@@ -51611,10 +40153,10 @@ if test $ac_cv_lib_vpx_vpx_codec_destroy = yes; then
     ai_p=$GD_VPX_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_VPX_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_VPX_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_VPX_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_VPX_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -51654,10 +40196,10 @@ if test $ac_cv_lib_vpx_vpx_codec_destroy = yes; then
     ai_p=$GD_VPX_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_VPX_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_VPX_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_VPX_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_VPX_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -51704,16 +40246,14 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_vpx_vpx_codec_destroy
 
-      { { echo "$as_me:$LINENO: error: Problem with libvpx.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with libvpx.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Problem with libvpx.(a|so). Please check config.log for more information." "$LINENO" 5
 
 
 fi
 
   else
-    { echo "$as_me:$LINENO: result: If configure fails try --with-vpx-dir=<DIR>" >&5
-echo "${ECHO_T}If configure fails try --with-vpx-dir=<DIR>" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: If configure fails try --with-vpx-dir=<DIR>" >&5
+$as_echo "If configure fails try --with-vpx-dir=<DIR>" >&6; }
   fi
 
 
@@ -51724,9 +40264,7 @@ echo "${ECHO_T}If configure fails try --with-vpx-dir=<DIR>" >&6; }
     done
 
     if test -z "$GD_JPEG_DIR"; then
-      { { echo "$as_me:$LINENO: error: jpeglib.h not found." >&5
-echo "$as_me: error: jpeglib.h not found." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "jpeglib.h not found." "$LINENO" 5
     fi
 
 
@@ -51791,10 +40329,10 @@ echo "$as_me: error: jpeglib.h not found." >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -51826,18 +40364,14 @@ echo "$as_me: error: jpeglib.h not found." >&2;}
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for jpeg_read_header in -ljpeg" >&5
-echo $ECHO_N "checking for jpeg_read_header in -ljpeg... $ECHO_C" >&6; }
-if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_read_header in -ljpeg" >&5
+$as_echo_n "checking for jpeg_read_header in -ljpeg... " >&6; }
+if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljpeg  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -51855,39 +40389,18 @@ return jpeg_read_header ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_jpeg_jpeg_read_header=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_jpeg_jpeg_read_header=no
+  ac_cv_lib_jpeg_jpeg_read_header=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5
-echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_read_header" >&6; }
-if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5
+$as_echo "$ac_cv_lib_jpeg_jpeg_read_header" >&6; }
+if test "x$ac_cv_lib_jpeg_jpeg_read_header" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -51899,10 +40412,10 @@ if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then
     ai_p=$GD_JPEG_DIR/include
   else
 
-    ep_dir="`echo $GD_JPEG_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_JPEG_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_JPEG_DIR/include"`
   fi
 
 
@@ -51935,10 +40448,10 @@ if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then
     ai_p=$GD_JPEG_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_JPEG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_JPEG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_JPEG_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -51978,10 +40491,10 @@ if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then
     ai_p=$GD_JPEG_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_JPEG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_JPEG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_JPEG_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_JPEG_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -52028,16 +40541,14 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_jpeg_jpeg_read_header
 
-      { { echo "$as_me:$LINENO: error: Problem with libjpeg.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with libjpeg.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Problem with libjpeg.(a|so). Please check config.log for more information." "$LINENO" 5
 
 
 fi
 
   else
-    { echo "$as_me:$LINENO: result: If configure fails try --with-jpeg-dir=<DIR>" >&5
-echo "${ECHO_T}If configure fails try --with-jpeg-dir=<DIR>" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: If configure fails try --with-jpeg-dir=<DIR>" >&5
+$as_echo "If configure fails try --with-jpeg-dir=<DIR>" >&6; }
   fi
 
 
@@ -52048,15 +40559,11 @@ echo "${ECHO_T}If configure fails try --with-jpeg-dir=<DIR>" >&6; }
     done
 
     if test -z "$GD_PNG_DIR"; then
-      { { echo "$as_me:$LINENO: error: png.h not found." >&5
-echo "$as_me: error: png.h not found." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "png.h not found." "$LINENO" 5
     fi
 
     if test "$PHP_ZLIB_DIR" = "no"; then
-      { { echo "$as_me:$LINENO: error: PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" >&5
-echo "$as_me: error: PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" "$LINENO" 5
     fi
 
 
@@ -52121,10 +40628,10 @@ echo "$as_me: error: PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -52156,18 +40663,14 @@ echo "$as_me: error: PNG support requires ZLIB. Use --with-zlib-dir=<DIR>" >&2;}
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for png_write_image in -lpng" >&5
-echo $ECHO_N "checking for png_write_image in -lpng... $ECHO_C" >&6; }
-if test "${ac_cv_lib_png_png_write_image+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_write_image in -lpng" >&5
+$as_echo_n "checking for png_write_image in -lpng... " >&6; }
+if test "${ac_cv_lib_png_png_write_image+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpng  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -52185,39 +40688,18 @@ return png_write_image ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_png_png_write_image=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_png_png_write_image=no
+  ac_cv_lib_png_png_write_image=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_write_image" >&5
-echo "${ECHO_T}$ac_cv_lib_png_png_write_image" >&6; }
-if test $ac_cv_lib_png_png_write_image = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_write_image" >&5
+$as_echo "$ac_cv_lib_png_png_write_image" >&6; }
+if test "x$ac_cv_lib_png_png_write_image" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -52229,10 +40711,10 @@ if test $ac_cv_lib_png_png_write_image = yes; then
     ai_p=$GD_PNG_DIR/include
   else
 
-    ep_dir="`echo $GD_PNG_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_PNG_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_PNG_DIR/include"`
   fi
 
 
@@ -52265,10 +40747,10 @@ if test $ac_cv_lib_png_png_write_image = yes; then
     ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_ZLIB_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -52308,10 +40790,10 @@ if test $ac_cv_lib_png_png_write_image = yes; then
     ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_ZLIB_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -52362,10 +40844,10 @@ if test $ac_cv_lib_png_png_write_image = yes; then
     ai_p=$GD_PNG_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_PNG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_PNG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_PNG_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -52405,10 +40887,10 @@ if test $ac_cv_lib_png_png_write_image = yes; then
     ai_p=$GD_PNG_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_PNG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_PNG_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_PNG_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_PNG_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -52455,17 +40937,15 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_png_png_write_image
 
-      { { echo "$as_me:$LINENO: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information." "$LINENO" 5
 
 
 fi
 
 
   else
-    { echo "$as_me:$LINENO: result: If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" >&5
-echo "${ECHO_T}If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" >&5
+$as_echo "If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>" >&6; }
   fi
 
 
@@ -52476,9 +40956,7 @@ echo "${ECHO_T}If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<
     done
 
     if test -z "$GD_XPM_DIR"; then
-      { { echo "$as_me:$LINENO: error: libXpm.(a|so) not found." >&5
-echo "$as_me: error: libXpm.(a|so) not found." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "libXpm.(a|so) not found." "$LINENO" 5
     fi
 
     for i in include include/X11; do
@@ -52486,9 +40964,7 @@ echo "$as_me: error: libXpm.(a|so) not found." >&2;}
     done
 
     if test -z "$GD_XPM_INC"; then
-      { { echo "$as_me:$LINENO: error: xpm.h not found." >&5
-echo "$as_me: error: xpm.h not found." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "xpm.h not found." "$LINENO" 5
     fi
 
 
@@ -52553,10 +41029,10 @@ echo "$as_me: error: xpm.h not found." >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -52588,18 +41064,14 @@ echo "$as_me: error: xpm.h not found." >&2;}
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for XpmFreeXpmImage in -lXpm" >&5
-echo $ECHO_N "checking for XpmFreeXpmImage in -lXpm... $ECHO_C" >&6; }
-if test "${ac_cv_lib_Xpm_XpmFreeXpmImage+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmFreeXpmImage in -lXpm" >&5
+$as_echo_n "checking for XpmFreeXpmImage in -lXpm... " >&6; }
+if test "${ac_cv_lib_Xpm_XpmFreeXpmImage+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXpm  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -52617,39 +41089,18 @@ return XpmFreeXpmImage ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_Xpm_XpmFreeXpmImage=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_Xpm_XpmFreeXpmImage=no
+  ac_cv_lib_Xpm_XpmFreeXpmImage=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmFreeXpmImage" >&5
-echo "${ECHO_T}$ac_cv_lib_Xpm_XpmFreeXpmImage" >&6; }
-if test $ac_cv_lib_Xpm_XpmFreeXpmImage = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_XpmFreeXpmImage" >&5
+$as_echo "$ac_cv_lib_Xpm_XpmFreeXpmImage" >&6; }
+if test "x$ac_cv_lib_Xpm_XpmFreeXpmImage" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -52661,10 +41112,10 @@ if test $ac_cv_lib_Xpm_XpmFreeXpmImage = yes; then
     ai_p=$GD_XPM_INC
   else
 
-    ep_dir="`echo $GD_XPM_INC|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_XPM_INC|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_XPM_INC\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_XPM_INC"`
   fi
 
 
@@ -52697,10 +41148,10 @@ if test $ac_cv_lib_Xpm_XpmFreeXpmImage = yes; then
     ai_p=$GD_XPM_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_XPM_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -52740,10 +41191,10 @@ if test $ac_cv_lib_Xpm_XpmFreeXpmImage = yes; then
     ai_p=$GD_XPM_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_XPM_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -52794,10 +41245,10 @@ if test $ac_cv_lib_Xpm_XpmFreeXpmImage = yes; then
     ai_p=$GD_XPM_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_XPM_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -52837,10 +41288,10 @@ if test $ac_cv_lib_Xpm_XpmFreeXpmImage = yes; then
     ai_p=$GD_XPM_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_XPM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_XPM_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_XPM_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -52887,16 +41338,14 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_Xpm_XpmFreeXpmImage
 
-      { { echo "$as_me:$LINENO: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information." "$LINENO" 5
 
 
 fi
 
   else
-    { echo "$as_me:$LINENO: result: If configure fails try --with-xpm-dir=<DIR>" >&5
-echo "${ECHO_T}If configure fails try --with-xpm-dir=<DIR>" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: If configure fails try --with-xpm-dir=<DIR>" >&5
+$as_echo "If configure fails try --with-xpm-dir=<DIR>" >&6; }
   fi
 
 
@@ -52911,9 +41360,7 @@ echo "${ECHO_T}If configure fails try --with-xpm-dir=<DIR>" >&6; }
     done
 
     if test -z "$FREETYPE2_DIR"; then
-      { { echo "$as_me:$LINENO: error: freetype.h not found." >&5
-echo "$as_me: error: freetype.h not found." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "freetype.h not found." "$LINENO" 5
     fi
 
 
@@ -52978,10 +41425,10 @@ echo "$as_me: error: freetype.h not found." >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -53013,18 +41460,14 @@ echo "$as_me: error: freetype.h not found." >&2;}
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for FT_New_Face in -lfreetype" >&5
-echo $ECHO_N "checking for FT_New_Face in -lfreetype... $ECHO_C" >&6; }
-if test "${ac_cv_lib_freetype_FT_New_Face+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_New_Face in -lfreetype" >&5
+$as_echo_n "checking for FT_New_Face in -lfreetype... " >&6; }
+if test "${ac_cv_lib_freetype_FT_New_Face+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfreetype  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -53042,39 +41485,18 @@ return FT_New_Face ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_freetype_FT_New_Face=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_freetype_FT_New_Face=no
+  ac_cv_lib_freetype_FT_New_Face=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_New_Face" >&5
-echo "${ECHO_T}$ac_cv_lib_freetype_FT_New_Face" >&6; }
-if test $ac_cv_lib_freetype_FT_New_Face = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_New_Face" >&5
+$as_echo "$ac_cv_lib_freetype_FT_New_Face" >&6; }
+if test "x$ac_cv_lib_freetype_FT_New_Face" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -53091,10 +41513,10 @@ if test $ac_cv_lib_freetype_FT_New_Face = yes; then
     ai_p=$FREETYPE2_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $FREETYPE2_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $FREETYPE2_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$FREETYPE2_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -53134,10 +41556,10 @@ if test $ac_cv_lib_freetype_FT_New_Face = yes; then
     ai_p=$FREETYPE2_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $FREETYPE2_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $FREETYPE2_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$FREETYPE2_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -53183,10 +41605,10 @@ if test $ac_cv_lib_freetype_FT_New_Face = yes; then
     ai_p=$FREETYPE2_DIR/include
   else
 
-    ep_dir="`echo $FREETYPE2_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $FREETYPE2_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$FREETYPE2_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$FREETYPE2_DIR/include"`
   fi
 
 
@@ -53214,10 +41636,10 @@ if test $ac_cv_lib_freetype_FT_New_Face = yes; then
     ai_p=$FREETYPE2_INC_DIR
   else
 
-    ep_dir="`echo $FREETYPE2_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $FREETYPE2_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$FREETYPE2_INC_DIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$FREETYPE2_INC_DIR"`
   fi
 
 
@@ -53239,19 +41661,13 @@ if test $ac_cv_lib_freetype_FT_New_Face = yes; then
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_GD_IMGSTRTTF 1
-_ACEOF
+$as_echo "#define USE_GD_IMGSTRTTF 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBFREETYPE 1
-_ACEOF
+$as_echo "#define HAVE_LIBFREETYPE 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_GD_TTF 1
-_ACEOF
+$as_echo "#define ENABLE_GD_TTF 1" >>confdefs.h
 
 
 
@@ -53261,16 +41677,14 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_freetype_FT_New_Face
 
-      { { echo "$as_me:$LINENO: error: Problem with freetype.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with freetype.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Problem with freetype.(a|so). Please check config.log for more information." "$LINENO" 5
 
 
 fi
 
   else
-    { echo "$as_me:$LINENO: result: If configure fails try --with-freetype-dir=<DIR>" >&5
-echo "${ECHO_T}If configure fails try --with-freetype-dir=<DIR>" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: If configure fails try --with-freetype-dir=<DIR>" >&5
+$as_echo "If configure fails try --with-freetype-dir=<DIR>" >&6; }
   fi
 
 
@@ -53281,9 +41695,7 @@ echo "${ECHO_T}If configure fails try --with-freetype-dir=<DIR>" >&6; }
     done
 
     if test -z "$GD_T1_DIR"; then
-      { { echo "$as_me:$LINENO: error: Your t1lib distribution is not installed correctly. Please reinstall it." >&5
-echo "$as_me: error: Your t1lib distribution is not installed correctly. Please reinstall it." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Your t1lib distribution is not installed correctly. Please reinstall it." "$LINENO" 5
     fi
 
 
@@ -53348,10 +41760,10 @@ echo "$as_me: error: Your t1lib distribution is not installed correctly. Please
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -53383,18 +41795,14 @@ echo "$as_me: error: Your t1lib distribution is not installed correctly. Please
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for T1_StrError in -lt1" >&5
-echo $ECHO_N "checking for T1_StrError in -lt1... $ECHO_C" >&6; }
-if test "${ac_cv_lib_t1_T1_StrError+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for T1_StrError in -lt1" >&5
+$as_echo_n "checking for T1_StrError in -lt1... " >&6; }
+if test "${ac_cv_lib_t1_T1_StrError+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lt1  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -53412,47 +41820,24 @@ return T1_StrError ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_t1_T1_StrError=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_t1_T1_StrError=no
+  ac_cv_lib_t1_T1_StrError=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_t1_T1_StrError" >&5
-echo "${ECHO_T}$ac_cv_lib_t1_T1_StrError" >&6; }
-if test $ac_cv_lib_t1_T1_StrError = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_t1_T1_StrError" >&5
+$as_echo "$ac_cv_lib_t1_T1_StrError" >&6; }
+if test "x$ac_cv_lib_t1_T1_StrError" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBT1 1
-_ACEOF
+$as_echo "#define HAVE_LIBT1 1" >>confdefs.h
 
 
   if test "$GD_T1_DIR/include" != "/usr/include"; then
@@ -53461,10 +41846,10 @@ _ACEOF
     ai_p=$GD_T1_DIR/include
   else
 
-    ep_dir="`echo $GD_T1_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_T1_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_T1_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_T1_DIR/include"`
   fi
 
 
@@ -53497,10 +41882,10 @@ _ACEOF
     ai_p=$GD_T1_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_T1_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_T1_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_T1_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_T1_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -53540,10 +41925,10 @@ _ACEOF
     ai_p=$GD_T1_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GD_T1_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_T1_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_T1_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_T1_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -53590,9 +41975,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_t1_T1_StrError
 
-      { { echo "$as_me:$LINENO: error: Problem with libt1.(a|so). Please check config.log for more information." >&5
-echo "$as_me: error: Problem with libt1.(a|so). Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Problem with libt1.(a|so). Please check config.log for more information." "$LINENO" 5
 
 
 fi
@@ -53621,10 +42004,10 @@ fi
     ai_p=$GD_LIB
   else
 
-    ep_dir="`echo $GD_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_LIB|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_LIB\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_LIB"`
   fi
 
 
@@ -53664,10 +42047,10 @@ fi
     ai_p=$GD_LIB
   else
 
-    ep_dir="`echo $GD_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_LIB|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_LIB\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_LIB"`
   fi
 
 
@@ -53707,9 +42090,7 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBGD 1
-_ACEOF
+$as_echo "#define HAVE_LIBGD 1" >>confdefs.h
 
 
 
@@ -53772,10 +42153,10 @@ _ACEOF
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -53807,18 +42188,14 @@ _ACEOF
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImageString16 in -lgd" >&5
-echo $ECHO_N "checking for gdImageString16 in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageString16+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageString16 in -lgd" >&5
+$as_echo_n "checking for gdImageString16 in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImageString16+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -53836,46 +42213,23 @@ return gdImageString16 ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageString16=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImageString16=no
+  ac_cv_lib_gd_gdImageString16=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageString16" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageString16" >&6; }
-if test $ac_cv_lib_gd_gdImageString16 = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageString16" >&5
+$as_echo "$ac_cv_lib_gd_gdImageString16" >&6; }
+if test "x$ac_cv_lib_gd_gdImageString16" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBGD13 1
-_ACEOF
+$as_echo "#define HAVE_LIBGD13 1" >>confdefs.h
 
 
 else
@@ -53947,10 +42301,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -53982,18 +42336,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImagePaletteCopy in -lgd" >&5
-echo $ECHO_N "checking for gdImagePaletteCopy in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImagePaletteCopy+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImagePaletteCopy in -lgd" >&5
+$as_echo_n "checking for gdImagePaletteCopy in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImagePaletteCopy+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -54011,46 +42361,23 @@ return gdImagePaletteCopy ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImagePaletteCopy=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImagePaletteCopy=no
+  ac_cv_lib_gd_gdImagePaletteCopy=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImagePaletteCopy" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImagePaletteCopy" >&6; }
-if test $ac_cv_lib_gd_gdImagePaletteCopy = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImagePaletteCopy" >&5
+$as_echo "$ac_cv_lib_gd_gdImagePaletteCopy" >&6; }
+if test "x$ac_cv_lib_gd_gdImagePaletteCopy" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBGD15 1
-_ACEOF
+$as_echo "#define HAVE_LIBGD15 1" >>confdefs.h
 
 
 else
@@ -54122,10 +42449,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -54157,18 +42484,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImageCreateFromPng in -lgd" >&5
-echo $ECHO_N "checking for gdImageCreateFromPng in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageCreateFromPng+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreateFromPng in -lgd" >&5
+$as_echo_n "checking for gdImageCreateFromPng in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImageCreateFromPng+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -54186,46 +42509,23 @@ return gdImageCreateFromPng ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageCreateFromPng=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImageCreateFromPng=no
+  ac_cv_lib_gd_gdImageCreateFromPng=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateFromPng" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreateFromPng" >&6; }
-if test $ac_cv_lib_gd_gdImageCreateFromPng = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreateFromPng" >&5
+$as_echo "$ac_cv_lib_gd_gdImageCreateFromPng" >&6; }
+if test "x$ac_cv_lib_gd_gdImageCreateFromPng" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_PNG 1
-_ACEOF
+$as_echo "#define HAVE_GD_PNG 1" >>confdefs.h
 
 
 else
@@ -54297,10 +42597,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -54332,18 +42632,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImageCreateFromGif in -lgd" >&5
-echo $ECHO_N "checking for gdImageCreateFromGif in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageCreateFromGif+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreateFromGif in -lgd" >&5
+$as_echo_n "checking for gdImageCreateFromGif in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImageCreateFromGif+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -54361,46 +42657,23 @@ return gdImageCreateFromGif ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageCreateFromGif=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImageCreateFromGif=no
+  ac_cv_lib_gd_gdImageCreateFromGif=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateFromGif" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreateFromGif" >&6; }
-if test $ac_cv_lib_gd_gdImageCreateFromGif = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreateFromGif" >&5
+$as_echo "$ac_cv_lib_gd_gdImageCreateFromGif" >&6; }
+if test "x$ac_cv_lib_gd_gdImageCreateFromGif" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_GIF_READ 1
-_ACEOF
+$as_echo "#define HAVE_GD_GIF_READ 1" >>confdefs.h
 
 
 else
@@ -54472,10 +42745,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -54507,18 +42780,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImageGif in -lgd" >&5
-echo $ECHO_N "checking for gdImageGif in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageGif+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageGif in -lgd" >&5
+$as_echo_n "checking for gdImageGif in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImageGif+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -54536,46 +42805,23 @@ return gdImageGif ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageGif=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImageGif=no
+  ac_cv_lib_gd_gdImageGif=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageGif" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageGif" >&6; }
-if test $ac_cv_lib_gd_gdImageGif = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageGif" >&5
+$as_echo "$ac_cv_lib_gd_gdImageGif" >&6; }
+if test "x$ac_cv_lib_gd_gdImageGif" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_GIF_CREATE 1
-_ACEOF
+$as_echo "#define HAVE_GD_GIF_CREATE 1" >>confdefs.h
 
 
 else
@@ -54647,10 +42893,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -54682,18 +42928,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImageWBMP in -lgd" >&5
-echo $ECHO_N "checking for gdImageWBMP in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageWBMP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageWBMP in -lgd" >&5
+$as_echo_n "checking for gdImageWBMP in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImageWBMP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -54711,46 +42953,23 @@ return gdImageWBMP ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageWBMP=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImageWBMP=no
+  ac_cv_lib_gd_gdImageWBMP=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageWBMP" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageWBMP" >&6; }
-if test $ac_cv_lib_gd_gdImageWBMP = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageWBMP" >&5
+$as_echo "$ac_cv_lib_gd_gdImageWBMP" >&6; }
+if test "x$ac_cv_lib_gd_gdImageWBMP" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_WBMP 1
-_ACEOF
+$as_echo "#define HAVE_GD_WBMP 1" >>confdefs.h
 
 
 else
@@ -54822,10 +43041,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -54857,18 +43076,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImageCreateFromJpeg in -lgd" >&5
-echo $ECHO_N "checking for gdImageCreateFromJpeg in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageCreateFromJpeg+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreateFromJpeg in -lgd" >&5
+$as_echo_n "checking for gdImageCreateFromJpeg in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImageCreateFromJpeg+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -54886,46 +43101,23 @@ return gdImageCreateFromJpeg ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageCreateFromJpeg=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImageCreateFromJpeg=no
+  ac_cv_lib_gd_gdImageCreateFromJpeg=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateFromJpeg" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreateFromJpeg" >&6; }
-if test $ac_cv_lib_gd_gdImageCreateFromJpeg = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreateFromJpeg" >&5
+$as_echo "$ac_cv_lib_gd_gdImageCreateFromJpeg" >&6; }
+if test "x$ac_cv_lib_gd_gdImageCreateFromJpeg" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_JPG 1
-_ACEOF
+$as_echo "#define HAVE_GD_JPG 1" >>confdefs.h
 
 
 else
@@ -54997,10 +43189,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -55032,18 +43224,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImageCreateFromXpm in -lgd" >&5
-echo $ECHO_N "checking for gdImageCreateFromXpm in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageCreateFromXpm+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreateFromXpm in -lgd" >&5
+$as_echo_n "checking for gdImageCreateFromXpm in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImageCreateFromXpm+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -55061,46 +43249,23 @@ return gdImageCreateFromXpm ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageCreateFromXpm=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImageCreateFromXpm=no
+  ac_cv_lib_gd_gdImageCreateFromXpm=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateFromXpm" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreateFromXpm" >&6; }
-if test $ac_cv_lib_gd_gdImageCreateFromXpm = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreateFromXpm" >&5
+$as_echo "$ac_cv_lib_gd_gdImageCreateFromXpm" >&6; }
+if test "x$ac_cv_lib_gd_gdImageCreateFromXpm" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_XPM 1
-_ACEOF
+$as_echo "#define HAVE_GD_XPM 1" >>confdefs.h
 
 
 else
@@ -55172,10 +43337,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -55207,18 +43372,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImageCreateFromGd2 in -lgd" >&5
-echo $ECHO_N "checking for gdImageCreateFromGd2 in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageCreateFromGd2+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreateFromGd2 in -lgd" >&5
+$as_echo_n "checking for gdImageCreateFromGd2 in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImageCreateFromGd2+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -55236,46 +43397,23 @@ return gdImageCreateFromGd2 ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageCreateFromGd2=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImageCreateFromGd2=no
+  ac_cv_lib_gd_gdImageCreateFromGd2=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateFromGd2" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreateFromGd2" >&6; }
-if test $ac_cv_lib_gd_gdImageCreateFromGd2 = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreateFromGd2" >&5
+$as_echo "$ac_cv_lib_gd_gdImageCreateFromGd2" >&6; }
+if test "x$ac_cv_lib_gd_gdImageCreateFromGd2" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_GD2 1
-_ACEOF
+$as_echo "#define HAVE_GD_GD2 1" >>confdefs.h
 
 
 else
@@ -55347,10 +43485,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -55382,18 +43520,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImageCreateTrueColor in -lgd" >&5
-echo $ECHO_N "checking for gdImageCreateTrueColor in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageCreateTrueColor+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreateTrueColor in -lgd" >&5
+$as_echo_n "checking for gdImageCreateTrueColor in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImageCreateTrueColor+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -55411,46 +43545,23 @@ return gdImageCreateTrueColor ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageCreateTrueColor=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImageCreateTrueColor=no
+  ac_cv_lib_gd_gdImageCreateTrueColor=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreateTrueColor" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreateTrueColor" >&6; }
-if test $ac_cv_lib_gd_gdImageCreateTrueColor = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreateTrueColor" >&5
+$as_echo "$ac_cv_lib_gd_gdImageCreateTrueColor" >&6; }
+if test "x$ac_cv_lib_gd_gdImageCreateTrueColor" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBGD20 1
-_ACEOF
+$as_echo "#define HAVE_LIBGD20 1" >>confdefs.h
 
 
 else
@@ -55522,10 +43633,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -55557,18 +43668,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImageSetTile in -lgd" >&5
-echo $ECHO_N "checking for gdImageSetTile in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageSetTile+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageSetTile in -lgd" >&5
+$as_echo_n "checking for gdImageSetTile in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImageSetTile+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -55586,46 +43693,23 @@ return gdImageSetTile ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageSetTile=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImageSetTile=no
+  ac_cv_lib_gd_gdImageSetTile=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageSetTile" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageSetTile" >&6; }
-if test $ac_cv_lib_gd_gdImageSetTile = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageSetTile" >&5
+$as_echo "$ac_cv_lib_gd_gdImageSetTile" >&6; }
+if test "x$ac_cv_lib_gd_gdImageSetTile" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_IMAGESETTILE 1
-_ACEOF
+$as_echo "#define HAVE_GD_IMAGESETTILE 1" >>confdefs.h
 
 
 else
@@ -55697,10 +43781,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -55732,18 +43816,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImageEllipse in -lgd" >&5
-echo $ECHO_N "checking for gdImageEllipse in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageEllipse+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageEllipse in -lgd" >&5
+$as_echo_n "checking for gdImageEllipse in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImageEllipse+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -55761,46 +43841,23 @@ return gdImageEllipse ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageEllipse=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImageEllipse=no
+  ac_cv_lib_gd_gdImageEllipse=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageEllipse" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageEllipse" >&6; }
-if test $ac_cv_lib_gd_gdImageEllipse = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageEllipse" >&5
+$as_echo "$ac_cv_lib_gd_gdImageEllipse" >&6; }
+if test "x$ac_cv_lib_gd_gdImageEllipse" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_IMAGEELLIPSE 1
-_ACEOF
+$as_echo "#define HAVE_GD_IMAGEELLIPSE 1" >>confdefs.h
 
 
 else
@@ -55872,10 +43929,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -55907,18 +43964,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImageSetBrush in -lgd" >&5
-echo $ECHO_N "checking for gdImageSetBrush in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageSetBrush+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageSetBrush in -lgd" >&5
+$as_echo_n "checking for gdImageSetBrush in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImageSetBrush+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -55936,46 +43989,23 @@ return gdImageSetBrush ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageSetBrush=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImageSetBrush=no
+  ac_cv_lib_gd_gdImageSetBrush=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageSetBrush" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageSetBrush" >&6; }
-if test $ac_cv_lib_gd_gdImageSetBrush = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageSetBrush" >&5
+$as_echo "$ac_cv_lib_gd_gdImageSetBrush" >&6; }
+if test "x$ac_cv_lib_gd_gdImageSetBrush" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_IMAGESETBRUSH 1
-_ACEOF
+$as_echo "#define HAVE_GD_IMAGESETBRUSH 1" >>confdefs.h
 
 
 else
@@ -56047,10 +44077,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -56082,18 +44112,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImageStringTTF in -lgd" >&5
-echo $ECHO_N "checking for gdImageStringTTF in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageStringTTF+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageStringTTF in -lgd" >&5
+$as_echo_n "checking for gdImageStringTTF in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImageStringTTF+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -56111,46 +44137,23 @@ return gdImageStringTTF ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageStringTTF=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImageStringTTF=no
+  ac_cv_lib_gd_gdImageStringTTF=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageStringTTF" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageStringTTF" >&6; }
-if test $ac_cv_lib_gd_gdImageStringTTF = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageStringTTF" >&5
+$as_echo "$ac_cv_lib_gd_gdImageStringTTF" >&6; }
+if test "x$ac_cv_lib_gd_gdImageStringTTF" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_STRINGTTF 1
-_ACEOF
+$as_echo "#define HAVE_GD_STRINGTTF 1" >>confdefs.h
 
 
 else
@@ -56222,10 +44225,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -56257,18 +44260,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImageStringFT in -lgd" >&5
-echo $ECHO_N "checking for gdImageStringFT in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageStringFT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageStringFT in -lgd" >&5
+$as_echo_n "checking for gdImageStringFT in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImageStringFT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -56286,46 +44285,23 @@ return gdImageStringFT ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageStringFT=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImageStringFT=no
+  ac_cv_lib_gd_gdImageStringFT=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageStringFT" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageStringFT" >&6; }
-if test $ac_cv_lib_gd_gdImageStringFT = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageStringFT" >&5
+$as_echo "$ac_cv_lib_gd_gdImageStringFT" >&6; }
+if test "x$ac_cv_lib_gd_gdImageStringFT" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_STRINGFT 1
-_ACEOF
+$as_echo "#define HAVE_GD_STRINGFT 1" >>confdefs.h
 
 
 else
@@ -56397,10 +44373,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -56432,18 +44408,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImageStringFTEx in -lgd" >&5
-echo $ECHO_N "checking for gdImageStringFTEx in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageStringFTEx+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageStringFTEx in -lgd" >&5
+$as_echo_n "checking for gdImageStringFTEx in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImageStringFTEx+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -56461,46 +44433,23 @@ return gdImageStringFTEx ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageStringFTEx=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImageStringFTEx=no
+  ac_cv_lib_gd_gdImageStringFTEx=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageStringFTEx" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageStringFTEx" >&6; }
-if test $ac_cv_lib_gd_gdImageStringFTEx = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageStringFTEx" >&5
+$as_echo "$ac_cv_lib_gd_gdImageStringFTEx" >&6; }
+if test "x$ac_cv_lib_gd_gdImageStringFTEx" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_STRINGFTEX 1
-_ACEOF
+$as_echo "#define HAVE_GD_STRINGFTEX 1" >>confdefs.h
 
 
 else
@@ -56572,10 +44521,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -56607,18 +44556,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImageColorClosestHWB in -lgd" >&5
-echo $ECHO_N "checking for gdImageColorClosestHWB in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageColorClosestHWB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageColorClosestHWB in -lgd" >&5
+$as_echo_n "checking for gdImageColorClosestHWB in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImageColorClosestHWB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -56636,46 +44581,23 @@ return gdImageColorClosestHWB ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageColorClosestHWB=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImageColorClosestHWB=no
+  ac_cv_lib_gd_gdImageColorClosestHWB=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageColorClosestHWB" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageColorClosestHWB" >&6; }
-if test $ac_cv_lib_gd_gdImageColorClosestHWB = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageColorClosestHWB" >&5
+$as_echo "$ac_cv_lib_gd_gdImageColorClosestHWB" >&6; }
+if test "x$ac_cv_lib_gd_gdImageColorClosestHWB" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_COLORCLOSESTHWB 1
-_ACEOF
+$as_echo "#define HAVE_COLORCLOSESTHWB 1" >>confdefs.h
 
 
 else
@@ -56747,10 +44669,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -56782,18 +44704,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImageColorResolve in -lgd" >&5
-echo $ECHO_N "checking for gdImageColorResolve in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageColorResolve+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageColorResolve in -lgd" >&5
+$as_echo_n "checking for gdImageColorResolve in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImageColorResolve+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -56811,46 +44729,23 @@ return gdImageColorResolve ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageColorResolve=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImageColorResolve=no
+  ac_cv_lib_gd_gdImageColorResolve=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageColorResolve" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageColorResolve" >&6; }
-if test $ac_cv_lib_gd_gdImageColorResolve = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageColorResolve" >&5
+$as_echo "$ac_cv_lib_gd_gdImageColorResolve" >&6; }
+if test "x$ac_cv_lib_gd_gdImageColorResolve" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GDIMAGECOLORRESOLVE 1
-_ACEOF
+$as_echo "#define HAVE_GDIMAGECOLORRESOLVE 1" >>confdefs.h
 
 
 else
@@ -56922,10 +44817,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -56957,18 +44852,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImageGifCtx in -lgd" >&5
-echo $ECHO_N "checking for gdImageGifCtx in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageGifCtx+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageGifCtx in -lgd" >&5
+$as_echo_n "checking for gdImageGifCtx in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImageGifCtx+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -56986,46 +44877,23 @@ return gdImageGifCtx ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageGifCtx=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImageGifCtx=no
+  ac_cv_lib_gd_gdImageGifCtx=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageGifCtx" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageGifCtx" >&6; }
-if test $ac_cv_lib_gd_gdImageGifCtx = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageGifCtx" >&5
+$as_echo "$ac_cv_lib_gd_gdImageGifCtx" >&6; }
+if test "x$ac_cv_lib_gd_gdImageGifCtx" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_GIF_CTX 1
-_ACEOF
+$as_echo "#define HAVE_GD_GIF_CTX 1" >>confdefs.h
 
 
 else
@@ -57097,10 +44965,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -57132,18 +45000,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdCacheCreate in -lgd" >&5
-echo $ECHO_N "checking for gdCacheCreate in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdCacheCreate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdCacheCreate in -lgd" >&5
+$as_echo_n "checking for gdCacheCreate in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdCacheCreate+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -57161,46 +45025,23 @@ return gdCacheCreate ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdCacheCreate=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdCacheCreate=no
+  ac_cv_lib_gd_gdCacheCreate=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdCacheCreate" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdCacheCreate" >&6; }
-if test $ac_cv_lib_gd_gdCacheCreate = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdCacheCreate" >&5
+$as_echo "$ac_cv_lib_gd_gdCacheCreate" >&6; }
+if test "x$ac_cv_lib_gd_gdCacheCreate" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_CACHE_CREATE 1
-_ACEOF
+$as_echo "#define HAVE_GD_CACHE_CREATE 1" >>confdefs.h
 
 
 else
@@ -57272,10 +45113,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -57307,18 +45148,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdFontCacheShutdown in -lgd" >&5
-echo $ECHO_N "checking for gdFontCacheShutdown in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdFontCacheShutdown+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdFontCacheShutdown in -lgd" >&5
+$as_echo_n "checking for gdFontCacheShutdown in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdFontCacheShutdown+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -57336,46 +45173,23 @@ return gdFontCacheShutdown ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdFontCacheShutdown=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdFontCacheShutdown=no
+  ac_cv_lib_gd_gdFontCacheShutdown=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdFontCacheShutdown" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdFontCacheShutdown" >&6; }
-if test $ac_cv_lib_gd_gdFontCacheShutdown = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdFontCacheShutdown" >&5
+$as_echo "$ac_cv_lib_gd_gdFontCacheShutdown" >&6; }
+if test "x$ac_cv_lib_gd_gdFontCacheShutdown" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_FONTCACHESHUTDOWN 1
-_ACEOF
+$as_echo "#define HAVE_GD_FONTCACHESHUTDOWN 1" >>confdefs.h
 
 
 else
@@ -57447,10 +45261,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -57482,18 +45296,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdFreeFontCache in -lgd" >&5
-echo $ECHO_N "checking for gdFreeFontCache in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdFreeFontCache+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdFreeFontCache in -lgd" >&5
+$as_echo_n "checking for gdFreeFontCache in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdFreeFontCache+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -57511,46 +45321,23 @@ return gdFreeFontCache ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdFreeFontCache=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdFreeFontCache=no
+  ac_cv_lib_gd_gdFreeFontCache=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdFreeFontCache" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdFreeFontCache" >&6; }
-if test $ac_cv_lib_gd_gdFreeFontCache = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdFreeFontCache" >&5
+$as_echo "$ac_cv_lib_gd_gdFreeFontCache" >&6; }
+if test "x$ac_cv_lib_gd_gdFreeFontCache" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_FREEFONTCACHE 1
-_ACEOF
+$as_echo "#define HAVE_GD_FREEFONTCACHE 1" >>confdefs.h
 
 
 else
@@ -57622,10 +45409,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -57657,18 +45444,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdFontCacheMutexSetup in -lgd" >&5
-echo $ECHO_N "checking for gdFontCacheMutexSetup in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdFontCacheMutexSetup+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdFontCacheMutexSetup in -lgd" >&5
+$as_echo_n "checking for gdFontCacheMutexSetup in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdFontCacheMutexSetup+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -57686,46 +45469,23 @@ return gdFontCacheMutexSetup ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdFontCacheMutexSetup=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdFontCacheMutexSetup=no
+  ac_cv_lib_gd_gdFontCacheMutexSetup=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdFontCacheMutexSetup" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdFontCacheMutexSetup" >&6; }
-if test $ac_cv_lib_gd_gdFontCacheMutexSetup = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdFontCacheMutexSetup" >&5
+$as_echo "$ac_cv_lib_gd_gdFontCacheMutexSetup" >&6; }
+if test "x$ac_cv_lib_gd_gdFontCacheMutexSetup" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_FONTMUTEX 1
-_ACEOF
+$as_echo "#define HAVE_GD_FONTMUTEX 1" >>confdefs.h
 
 
 else
@@ -57797,10 +45557,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -57832,18 +45592,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdNewDynamicCtxEx in -lgd" >&5
-echo $ECHO_N "checking for gdNewDynamicCtxEx in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdNewDynamicCtxEx+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdNewDynamicCtxEx in -lgd" >&5
+$as_echo_n "checking for gdNewDynamicCtxEx in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdNewDynamicCtxEx+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -57861,46 +45617,23 @@ return gdNewDynamicCtxEx ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdNewDynamicCtxEx=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdNewDynamicCtxEx=no
+  ac_cv_lib_gd_gdNewDynamicCtxEx=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdNewDynamicCtxEx" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdNewDynamicCtxEx" >&6; }
-if test $ac_cv_lib_gd_gdNewDynamicCtxEx = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdNewDynamicCtxEx" >&5
+$as_echo "$ac_cv_lib_gd_gdNewDynamicCtxEx" >&6; }
+if test "x$ac_cv_lib_gd_gdNewDynamicCtxEx" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_DYNAMIC_CTX_EX 1
-_ACEOF
+$as_echo "#define HAVE_GD_DYNAMIC_CTX_EX 1" >>confdefs.h
 
 
 else
@@ -57972,10 +45705,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -58007,18 +45740,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImageConvolution in -lgd" >&5
-echo $ECHO_N "checking for gdImageConvolution in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageConvolution+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageConvolution in -lgd" >&5
+$as_echo_n "checking for gdImageConvolution in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImageConvolution+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -58036,46 +45765,23 @@ return gdImageConvolution ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageConvolution=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImageConvolution=no
+  ac_cv_lib_gd_gdImageConvolution=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageConvolution" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageConvolution" >&6; }
-if test $ac_cv_lib_gd_gdImageConvolution = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageConvolution" >&5
+$as_echo "$ac_cv_lib_gd_gdImageConvolution" >&6; }
+if test "x$ac_cv_lib_gd_gdImageConvolution" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_IMAGE_CONVOLUTION 1
-_ACEOF
+$as_echo "#define HAVE_GD_IMAGE_CONVOLUTION 1" >>confdefs.h
 
 
 else
@@ -58147,10 +45853,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -58182,18 +45888,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImagePixelate in -lgd" >&5
-echo $ECHO_N "checking for gdImagePixelate in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImagePixelate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImagePixelate in -lgd" >&5
+$as_echo_n "checking for gdImagePixelate in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImagePixelate+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -58211,46 +45913,23 @@ return gdImagePixelate ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImagePixelate=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImagePixelate=no
+  ac_cv_lib_gd_gdImagePixelate=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImagePixelate" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImagePixelate" >&6; }
-if test $ac_cv_lib_gd_gdImagePixelate = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImagePixelate" >&5
+$as_echo "$ac_cv_lib_gd_gdImagePixelate" >&6; }
+if test "x$ac_cv_lib_gd_gdImagePixelate" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GD_IMAGE_PIXELATE 1
-_ACEOF
+$as_echo "#define HAVE_GD_IMAGE_PIXELATE 1" >>confdefs.h
 
 
 else
@@ -58264,13 +45943,9 @@ fi
 
 
   elif test -z "$GD_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: Unable to find gd.h anywhere under $PHP_GD" >&5
-echo "$as_me: error: Unable to find gd.h anywhere under $PHP_GD" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Unable to find gd.h anywhere under $PHP_GD" "$LINENO" 5
   else
-    { { echo "$as_me:$LINENO: error: Unable to find libgd.(a|so) anywhere under $PHP_GD" >&5
-echo "$as_me: error: Unable to find libgd.(a|so) anywhere under $PHP_GD" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Unable to find libgd.(a|so) anywhere under $PHP_GD" "$LINENO" 5
   fi
 
 
@@ -58278,20 +45953,16 @@ echo "$as_me: error: Unable to find libgd.(a|so) anywhere under $PHP_GD" >&2;}
     GD_INCLUDE=$GD_INCLUDE
   else
 
-    ep_dir="`echo $GD_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    GD_INCLUDE="$ep_realdir/`basename \"$GD_INCLUDE\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    GD_INCLUDE="$ep_realdir"/`basename "$GD_INCLUDE"`
   fi
 
 
         old_CPPFLAGS=$CPPFLAGS
   CPPFLAGS=-I$GD_INCLUDE
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <gd.h>
@@ -58309,37 +45980,13 @@ ctx->gd_free = 1;
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBGD204 1
-_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+$as_echo "#define HAVE_LIBGD204 1" >>confdefs.h
 
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   CPPFLAGS=$old_CPPFLAGS
 
@@ -58654,16 +46301,12 @@ EOF
 
   old_LIBS=$LIBS
   LIBS=" $GD_SHARED_LIBADD  $LIBS"
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
     LIBS=$old_LIBS
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
     char foobar () {}
@@ -58674,50 +46317,24 @@ cat >>conftest.$ac_ext <<_ACEOF
     }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     LIBS=$old_LIBS
 
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     LIBS=$old_LIBS
 
-      { { echo "$as_me:$LINENO: error: GD build test failed. Please check the config.log for details." >&5
-echo "$as_me: error: GD build test failed. Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "GD build test failed. Please check the config.log for details." "$LINENO" 5
 
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
-
   else
     GD_HEADER_DIRS="ext/gd/"
     GDLIB_CFLAGS="-I$GD_INCLUDE $GDLIB_CFLAGS"
@@ -58728,10 +46345,10 @@ fi
     ai_p=$GD_INCLUDE
   else
 
-    ep_dir="`echo $GD_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GD_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GD_INCLUDE\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GD_INCLUDE"`
   fi
 
 
@@ -58812,10 +46429,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -58847,18 +46464,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gdImageCreate in -lgd" >&5
-echo $ECHO_N "checking for gdImageCreate in -lgd... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gd_gdImageCreate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreate in -lgd" >&5
+$as_echo_n "checking for gdImageCreate in -lgd... " >&6; }
+if test "${ac_cv_lib_gd_gdImageCreate+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -58876,39 +46489,18 @@ return gdImageCreate ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageCreate=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gd_gdImageCreate=no
+  ac_cv_lib_gd_gdImageCreate=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_gdImageCreate" >&5
-echo "${ECHO_T}$ac_cv_lib_gd_gdImageCreate" >&6; }
-if test $ac_cv_lib_gd_gdImageCreate = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreate" >&5
+$as_echo "$ac_cv_lib_gd_gdImageCreate" >&6; }
+if test "x$ac_cv_lib_gd_gdImageCreate" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -58920,9 +46512,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageCreate
 
-      { { echo "$as_me:$LINENO: error: GD build test failed. Please check the config.log for details." >&5
-echo "$as_me: error: GD build test failed. Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "GD build test failed. Please check the config.log for details." "$LINENO" 5
 
 
 fi
@@ -58959,11 +46549,11 @@ fi
 
 php_with_gettext=no
 
-{ echo "$as_me:$LINENO: checking for GNU gettext support" >&5
-echo $ECHO_N "checking for GNU gettext support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext support" >&5
+$as_echo_n "checking for GNU gettext support... " >&6; }
 
 # Check whether --with-gettext was given.
-if test "${with_gettext+set}" = set; then
+if test "${with_gettext+set}" = set; then :
   withval=$with_gettext; PHP_GETTEXT=$withval
 else
 
@@ -58995,8 +46585,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -59007,9 +46597,7 @@ if test "$PHP_GETTEXT" != "no"; then
   done
 
   if test -z "$GETTEXT_DIR"; then
-    { { echo "$as_me:$LINENO: error: Cannot locate header file libintl.h" >&5
-echo "$as_me: error: Cannot locate header file libintl.h" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Cannot locate header file libintl.h" "$LINENO" 5
   fi
 
   GETTEXT_LIBDIR=$GETTEXT_DIR/$PHP_LIBDIR
@@ -59017,18 +46605,14 @@ echo "$as_me: error: Cannot locate header file libintl.h" >&2;}
 
   O_LDFLAGS=$LDFLAGS
   LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR"
-  { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
-echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
+$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -59046,56 +46630,31 @@ return bindtextdomain ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_intl_bindtextdomain=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_intl_bindtextdomain=no
+  ac_cv_lib_intl_bindtextdomain=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; }
-if test $ac_cv_lib_intl_bindtextdomain = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
+$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
 
 	GETTEXT_LIBS=intl
 	GETTEXT_CHECK_IN_LIB=intl
 
 else
-  { echo "$as_me:$LINENO: checking for bindtextdomain in -lc" >&5
-echo $ECHO_N "checking for bindtextdomain in -lc... $ECHO_C" >&6; }
-if test "${ac_cv_lib_c_bindtextdomain+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lc" >&5
+$as_echo_n "checking for bindtextdomain in -lc... " >&6; }
+if test "${ac_cv_lib_c_bindtextdomain+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -59113,48 +46672,25 @@ return bindtextdomain ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_c_bindtextdomain=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_c_bindtextdomain=no
+  ac_cv_lib_c_bindtextdomain=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_bindtextdomain" >&5
-echo "${ECHO_T}$ac_cv_lib_c_bindtextdomain" >&6; }
-if test $ac_cv_lib_c_bindtextdomain = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_bindtextdomain" >&5
+$as_echo "$ac_cv_lib_c_bindtextdomain" >&6; }
+if test "x$ac_cv_lib_c_bindtextdomain" = x""yes; then :
 
 		GETTEXT_LIBS=
 		GETTEXT_CHECK_IN_LIB=c
 
 else
 
-		{ { echo "$as_me:$LINENO: error: Unable to find required gettext library" >&5
-echo "$as_me: error: Unable to find required gettext library" >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error "Unable to find required gettext library" "$LINENO" 5
 
 fi
 
@@ -59164,9 +46700,7 @@ fi
   LDFLAGS=$O_LDFLAGS
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBINTL 1
-_ACEOF
+$as_echo "#define HAVE_LIBINTL 1" >>confdefs.h
 
 
   ext_builddir=ext/gettext
@@ -59478,10 +47012,10 @@ EOF
     ai_p=$GETTEXT_LIBDIR
   else
 
-    ep_dir="`echo $GETTEXT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GETTEXT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GETTEXT_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GETTEXT_LIBDIR"`
   fi
 
 
@@ -59521,10 +47055,10 @@ EOF
     ai_p=$GETTEXT_LIBDIR
   else
 
-    ep_dir="`echo $GETTEXT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GETTEXT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GETTEXT_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GETTEXT_LIBDIR"`
   fi
 
 
@@ -59572,10 +47106,10 @@ EOF
     ai_p=$GETTEXT_INCDIR
   else
 
-    ep_dir="`echo $GETTEXT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GETTEXT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GETTEXT_INCDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GETTEXT_INCDIR"`
   fi
 
 
@@ -59597,19 +47131,15 @@ EOF
   fi
 
 
-  as_ac_Lib=`echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_ngettext" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
-echo $ECHO_N "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_ngettext" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
+$as_echo_n "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -59627,60 +47157,34 @@ return ngettext ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NGETTEXT 1
-_ACEOF
+$as_echo "#define HAVE_NGETTEXT 1" >>confdefs.h
 
 fi
 
-  as_ac_Lib=`echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_dngettext" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
-echo $ECHO_N "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_dngettext" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
+$as_echo_n "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -59698,60 +47202,34 @@ return dngettext ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DNGETTEXT 1
-_ACEOF
+$as_echo "#define HAVE_DNGETTEXT 1" >>confdefs.h
 
 fi
 
-  as_ac_Lib=`echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_dcngettext" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
-echo $ECHO_N "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_dcngettext" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
+$as_echo_n "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -59769,60 +47247,34 @@ return dcngettext ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DCNGETTEXT 1
-_ACEOF
+$as_echo "#define HAVE_DCNGETTEXT 1" >>confdefs.h
 
 fi
 
-  as_ac_Lib=`echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_bind_textdomain_codeset" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
-echo $ECHO_N "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$GETTEXT_CHECK_IN_LIB''_bind_textdomain_codeset" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
+$as_echo_n "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -59840,44 +47292,22 @@ return bind_textdomain_codeset ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BIND_TEXTDOMAIN_CODESET 1
-_ACEOF
+$as_echo "#define HAVE_BIND_TEXTDOMAIN_CODESET 1" >>confdefs.h
 
 fi
 
@@ -59888,11 +47318,11 @@ fi
 
 php_with_gmp=no
 
-{ echo "$as_me:$LINENO: checking for GNU MP support" >&5
-echo $ECHO_N "checking for GNU MP support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU MP support" >&5
+$as_echo_n "checking for GNU MP support... " >&6; }
 
 # Check whether --with-gmp was given.
-if test "${with_gmp+set}" = set; then
+if test "${with_gmp+set}" = set; then :
   withval=$with_gmp; PHP_GMP=$withval
 else
 
@@ -59924,8 +47354,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -59937,9 +47367,7 @@ if test "$PHP_GMP" != "no"; then
   done
 
   if test -z "$GMP_DIR"; then
-    { { echo "$as_me:$LINENO: error: Unable to locate gmp.h" >&5
-echo "$as_me: error: Unable to locate gmp.h" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Unable to locate gmp.h" "$LINENO" 5
   fi
 
 
@@ -60004,10 +47432,10 @@ echo "$as_me: error: Unable to locate gmp.h" >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -60039,18 +47467,14 @@ echo "$as_me: error: Unable to locate gmp.h" >&2;}
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5
-echo $ECHO_N "checking for __gmp_randinit_lc_2exp_size in -lgmp... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gmp___gmp_randinit_lc_2exp_size+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5
+$as_echo_n "checking for __gmp_randinit_lc_2exp_size in -lgmp... " >&6; }
+if test "${ac_cv_lib_gmp___gmp_randinit_lc_2exp_size+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgmp  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -60068,39 +47492,18 @@ return __gmp_randinit_lc_2exp_size ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gmp___gmp_randinit_lc_2exp_size=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gmp___gmp_randinit_lc_2exp_size=no
+  ac_cv_lib_gmp___gmp_randinit_lc_2exp_size=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gmp___gmp_randinit_lc_2exp_size" >&5
-echo "${ECHO_T}$ac_cv_lib_gmp___gmp_randinit_lc_2exp_size" >&6; }
-if test $ac_cv_lib_gmp___gmp_randinit_lc_2exp_size = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmp_randinit_lc_2exp_size" >&5
+$as_echo "$ac_cv_lib_gmp___gmp_randinit_lc_2exp_size" >&6; }
+if test "x$ac_cv_lib_gmp___gmp_randinit_lc_2exp_size" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -60174,10 +47577,10 @@ else
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -60209,18 +47612,14 @@ else
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5
-echo $ECHO_N "checking for gmp_randinit_lc_2exp_size in -lgmp... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gmp_gmp_randinit_lc_2exp_size+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5
+$as_echo_n "checking for gmp_randinit_lc_2exp_size in -lgmp... " >&6; }
+if test "${ac_cv_lib_gmp_gmp_randinit_lc_2exp_size+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgmp  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -60238,39 +47637,18 @@ return gmp_randinit_lc_2exp_size ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gmp_gmp_randinit_lc_2exp_size=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gmp_gmp_randinit_lc_2exp_size=no
+  ac_cv_lib_gmp_gmp_randinit_lc_2exp_size=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gmp_gmp_randinit_lc_2exp_size" >&5
-echo "${ECHO_T}$ac_cv_lib_gmp_gmp_randinit_lc_2exp_size" >&6; }
-if test $ac_cv_lib_gmp_gmp_randinit_lc_2exp_size = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp_gmp_randinit_lc_2exp_size" >&5
+$as_echo "$ac_cv_lib_gmp_gmp_randinit_lc_2exp_size" >&6; }
+if test "x$ac_cv_lib_gmp_gmp_randinit_lc_2exp_size" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -60282,9 +47660,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gmp_gmp_randinit_lc_2exp_size
 
-      { { echo "$as_me:$LINENO: error: GNU MP Library version 4.1.2 or greater required." >&5
-echo "$as_me: error: GNU MP Library version 4.1.2 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "GNU MP Library version 4.1.2 or greater required." "$LINENO" 5
 
 
 fi
@@ -60306,10 +47682,10 @@ fi
     ai_p=$GMP_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GMP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GMP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GMP_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GMP_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -60349,10 +47725,10 @@ fi
     ai_p=$GMP_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $GMP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GMP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GMP_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GMP_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -60398,10 +47774,10 @@ fi
     ai_p=$GMP_DIR/include
   else
 
-    ep_dir="`echo $GMP_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $GMP_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$GMP_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$GMP_DIR/include"`
   fi
 
 
@@ -60720,9 +48096,7 @@ EOF
   PHP_VAR_SUBST="$PHP_VAR_SUBST GMP_SHARED_LIBADD"
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GMP 1
-_ACEOF
+$as_echo "#define HAVE_GMP 1" >>confdefs.h
 
 fi
 
@@ -60730,11 +48104,11 @@ fi
 
 php_with_mhash=no
 
-{ echo "$as_me:$LINENO: checking for mhash support" >&5
-echo $ECHO_N "checking for mhash support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mhash support" >&5
+$as_echo_n "checking for mhash support... " >&6; }
 
 # Check whether --with-mhash was given.
-if test "${with_mhash+set}" = set; then
+if test "${with_mhash+set}" = set; then :
   withval=$with_mhash; PHP_MHASH=$withval
 else
 
@@ -60766,8 +48140,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -60775,10 +48149,10 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_enable_hash=yes
 
-{ echo "$as_me:$LINENO: checking whether to enable hash support" >&5
-echo $ECHO_N "checking whether to enable hash support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable hash support" >&5
+$as_echo_n "checking whether to enable hash support... " >&6; }
 # Check whether --enable-hash was given.
-if test "${enable_hash+set}" = set; then
+if test "${enable_hash+set}" = set; then :
   enableval=$enable_hash; PHP_HASH=$enableval
 else
 
@@ -60810,8 +48184,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -60822,34 +48196,26 @@ if test "$PHP_MHASH" != "no"; then
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define PHP_MHASH_BC 1
-_ACEOF
+$as_echo "#define PHP_MHASH_BC 1" >>confdefs.h
 
 fi
 
 if test "$PHP_HASH" != "no"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_HASH_EXT 1
-_ACEOF
+$as_echo "#define HAVE_HASH_EXT 1" >>confdefs.h
 
 
-  { echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
-if test "${ac_cv_c_bigendian_php+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $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 test "${ac_cv_c_bigendian_php+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
   ac_cv_c_bigendian_php=unknown
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_c_bigendian_php=unknown
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int main(void)
@@ -60865,449 +48231,52 @@ int main(void)
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_bigendian_php=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_bigendian_php=no
+  ac_cv_c_bigendian_php=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian_php" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian_php" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian_php" >&5
+$as_echo "$ac_cv_c_bigendian_php" >&6; }
  if test $ac_cv_c_bigendian_php = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN
-_ACEOF
+$as_echo "#define WORDS_BIGENDIAN /**/" >>confdefs.h
 
  fi
 
 
-  { echo "$as_me:$LINENO: checking for short" >&5
-echo $ECHO_N "checking for short... $ECHO_C" >&6; }
-if test "${ac_cv_type_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef short ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_short=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_short=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-echo "${ECHO_T}$ac_cv_type_short" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
+  # 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.
-{ echo "$as_me:$LINENO: checking size of short" >&5
-echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
+$as_echo_n "checking size of short... " >&6; }
+if test "${ac_cv_sizeof_short+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_short=$ac_lo;;
-'') if test "$ac_cv_type_short" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_short=0
-   fi ;;
-esac
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef short ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_short=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_short" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_short" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (short)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_short=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-echo "${ECHO_T}$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; }
 
 
 
@@ -61316,403 +48285,32 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-  { echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6; }
-if test "${ac_cv_type_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef int ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
+  # 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.
-{ echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
+if test "${ac_cv_sizeof_int+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
 
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_int=$ac_lo;;
-'') if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_int=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (int)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_int=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$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; }
 
 
 
@@ -61721,403 +48319,32 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-  { echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
+  # 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.
-{ echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if test "${ac_cv_sizeof_long+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
 
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long=$ac_lo;;
-'') if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long=0
-   fi ;;
-esac
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_long=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$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; }
 
 
 
@@ -62126,403 +48353,32 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-  { echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long long ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_long_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
+  # 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.
-{ echo "$as_me:$LINENO: checking size of long long" >&5
-echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+$as_echo_n "checking size of long long... " >&6; }
+if test "${ac_cv_sizeof_long_long+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
 
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_long=$ac_lo;;
-'') if test "$ac_cv_type_long_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_long=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_long_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_long_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long long)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_long_long=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-echo "${ECHO_T}$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; }
 
 
 
@@ -62861,11 +48717,11 @@ fi
 
 php_with_iconv=yes
 
-{ echo "$as_me:$LINENO: checking for iconv support" >&5
-echo $ECHO_N "checking for iconv support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv support" >&5
+$as_echo_n "checking for iconv support... " >&6; }
 
 # Check whether --with-iconv was given.
-if test "${with_iconv+set}" = set; then
+if test "${with_iconv+set}" = set; then :
   withval=$with_iconv; PHP_ICONV=$withval
 else
 
@@ -62897,8 +48753,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -62926,183 +48782,21 @@ if test "$PHP_ICONV" != "no"; then
   if test "$PHP_ICONV" = "yes"; then
             LIBS_save="$LIBS"
     LIBS=
-    { echo "$as_me:$LINENO: checking for iconv" >&5
-echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
-if test "${ac_cv_func_iconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define iconv to an innocuous variant, in case <limits.h> declares iconv.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define iconv innocuous_iconv
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char iconv (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef iconv
-
-/* 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 iconv ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_iconv || defined __stub___iconv
-choke me
-#endif
-
-int
-main ()
-{
-return iconv ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_iconv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_iconv=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_iconv" >&5
-echo "${ECHO_T}$ac_cv_func_iconv" >&6; }
-if test $ac_cv_func_iconv = yes; then
+    ac_fn_c_check_func "$LINENO" "iconv" "ac_cv_func_iconv"
+if test "x$ac_cv_func_iconv" = x""yes; then :
 
       found_iconv=yes
 
 else
 
-      { echo "$as_me:$LINENO: checking for libiconv" >&5
-echo $ECHO_N "checking for libiconv... $ECHO_C" >&6; }
-if test "${ac_cv_func_libiconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define libiconv to an innocuous variant, in case <limits.h> declares libiconv.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define libiconv innocuous_libiconv
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char libiconv (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef libiconv
-
-/* 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 libiconv ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_libiconv || defined __stub___libiconv
-choke me
-#endif
-
-int
-main ()
-{
-return libiconv ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_libiconv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_libiconv=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_libiconv" >&5
-echo "${ECHO_T}$ac_cv_func_libiconv" >&6; }
-if test $ac_cv_func_libiconv = yes; then
+      ac_fn_c_check_func "$LINENO" "libiconv" "ac_cv_func_libiconv"
+if test "x$ac_cv_func_libiconv" = x""yes; then :
 
 
   echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBICONV 1
-_ACEOF
+$as_echo "#define HAVE_LIBICONV 1" >>confdefs.h
 
         found_iconv=yes
 
@@ -63119,9 +48813,7 @@ fi
     for i in $PHP_ICONV /usr/local /usr; do
       if test -r $i/include/giconv.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GICONV_H 1
-_ACEOF
+$as_echo "#define HAVE_GICONV_H 1" >>confdefs.h
 
         ICONV_DIR=$i
         iconv_lib_name=giconv
@@ -63134,9 +48826,7 @@ _ACEOF
     done
 
     if test -z "$ICONV_DIR"; then
-      { { echo "$as_me:$LINENO: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" >&5
-echo "$as_me: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Please specify the install prefix of iconv with --with-iconv=<DIR>" "$LINENO" 5
     fi
 
     if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a ||
@@ -63204,10 +48894,10 @@ echo "$as_me: error: Please specify the install prefix of iconv with --with-icon
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -63239,19 +48929,15 @@ echo "$as_me: error: Please specify the install prefix of iconv with --with-icon
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$iconv_lib_name''_libiconv" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for libiconv in -l$iconv_lib_name" >&5
-echo $ECHO_N "checking for libiconv in -l$iconv_lib_name... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$iconv_lib_name''_libiconv" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv in -l$iconv_lib_name" >&5
+$as_echo_n "checking for libiconv in -l$iconv_lib_name... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$iconv_lib_name  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -63269,40 +48955,20 @@ return libiconv ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -63312,17 +48978,13 @@ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBICONV 1
-_ACEOF
+$as_echo "#define HAVE_LIBICONV 1" >>confdefs.h
 
 
   echo "#define ICONV_ALIASED_LIBICONV 1" > ext/iconv/php_iconv_aliased_libiconv.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define ICONV_ALIASED_LIBICONV 1
-_ACEOF
+$as_echo "#define ICONV_ALIASED_LIBICONV 1" >>confdefs.h
 
 
 
@@ -63394,10 +49056,10 @@ else
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -63429,19 +49091,15 @@ else
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$iconv_lib_name''_iconv" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for iconv in -l$iconv_lib_name" >&5
-echo $ECHO_N "checking for iconv in -l$iconv_lib_name... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$iconv_lib_name''_iconv" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv in -l$iconv_lib_name" >&5
+$as_echo_n "checking for iconv in -l$iconv_lib_name... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$iconv_lib_name  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -63459,40 +49117,20 @@ return iconv ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -63521,9 +49159,7 @@ fi
   echo "#define HAVE_ICONV 1" > ext/iconv/php_have_iconv.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ICONV 1
-_ACEOF
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
 
     if test -n "$ICONV_DIR"; then
 
@@ -63538,10 +49174,10 @@ _ACEOF
     ai_p=$ICONV_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ICONV_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -63581,10 +49217,10 @@ _ACEOF
     ai_p=$ICONV_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ICONV_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -63630,10 +49266,10 @@ _ACEOF
     ai_p=$ICONV_DIR/include
   else
 
-    ep_dir="`echo $ICONV_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ICONV_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ICONV_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ICONV_DIR/include"`
   fi
 
 
@@ -63688,13 +49324,9 @@ else
       PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h"
     fi
 
-    { echo "$as_me:$LINENO: checking if iconv is glibc's" >&5
-echo $ECHO_N "checking if iconv is glibc's... $ECHO_C" >&6; }
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv is glibc's" >&5
+$as_echo_n "checking if iconv is glibc's... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <gnu/libc-version.h>
 int
@@ -63705,59 +49337,34 @@ gnu_get_libc_version();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
 
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       iconv_impl_name="glibc"
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
     if test -z "$iconv_impl_name"; then
-      { echo "$as_me:$LINENO: checking if using GNU libiconv" >&5
-echo $ECHO_N "checking if using GNU libiconv... $ECHO_C" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if using GNU libiconv" >&5
+$as_echo_n "checking if using GNU libiconv... " >&6; }
       php_iconv_old_ld="$LDFLAGS"
       LDFLAGS="-liconv $LDFLAGS"
-      if test "$cross_compiling" = yes; then
+      if test "$cross_compiling" = yes; then :
 
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         LDFLAGS="$php_iconv_old_ld"
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <$PHP_ICONV_H_PATH>
@@ -63767,57 +49374,29 @@ int main() {
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
         iconv_impl_name="gnu_libiconv"
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         LDFLAGS="$php_iconv_old_ld"
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     fi
 
     if test -z "$iconv_impl_name"; then
-      { echo "$as_me:$LINENO: checking if iconv is Konstantin Chuguev's" >&5
-echo $ECHO_N "checking if iconv is Konstantin Chuguev's... $ECHO_C" >&6; }
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv is Konstantin Chuguev's" >&5
+$as_echo_n "checking if iconv is Konstantin Chuguev's... " >&6; }
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <iconv.h>
 int
@@ -63828,53 +49407,28 @@ iconv_ccs_init(NULL, NULL);
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
 
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
         iconv_impl_name="bsd"
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
     fi
 
     if test -z "$iconv_impl_name"; then
-      { echo "$as_me:$LINENO: checking if using IBM iconv" >&5
-echo $ECHO_N "checking if using IBM iconv... $ECHO_C" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if using IBM iconv" >&5
+$as_echo_n "checking if using IBM iconv... " >&6; }
       php_iconv_old_ld="$LDFLAGS"
       LDFLAGS="-liconv $LDFLAGS"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <iconv.h>
 int
@@ -63885,42 +49439,21 @@ cstoccsid("");
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
 
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
         iconv_impl_name="ibm"
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         LDFLAGS="$php_iconv_old_ld"
 
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
     fi
 
     echo > ext/iconv/php_have_bsd_iconv.h
@@ -63934,9 +49467,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
   echo "#define PHP_ICONV_IMPL \"libiconv\"" > ext/iconv/php_php_iconv_impl.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define PHP_ICONV_IMPL "libiconv"
-_ACEOF
+$as_echo "#define PHP_ICONV_IMPL \"libiconv\"" >>confdefs.h
 
 
   echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h
@@ -63953,10 +49484,10 @@ _ACEOF
     ai_p="$PHP_ICONV_PREFIX/$PHP_LIBDIR"
   else
 
-    ep_dir="`echo "$PHP_ICONV_PREFIX/$PHP_LIBDIR"|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo "$PHP_ICONV_PREFIX/$PHP_LIBDIR"|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \""$PHP_ICONV_PREFIX/$PHP_LIBDIR"\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename ""$PHP_ICONV_PREFIX/$PHP_LIBDIR""`
   fi
 
 
@@ -63996,10 +49527,10 @@ _ACEOF
     ai_p="$PHP_ICONV_PREFIX/$PHP_LIBDIR"
   else
 
-    ep_dir="`echo "$PHP_ICONV_PREFIX/$PHP_LIBDIR"|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo "$PHP_ICONV_PREFIX/$PHP_LIBDIR"|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \""$PHP_ICONV_PREFIX/$PHP_LIBDIR"\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename ""$PHP_ICONV_PREFIX/$PHP_LIBDIR""`
   fi
 
 
@@ -64045,17 +49576,13 @@ _ACEOF
   echo "#define HAVE_BSD_ICONV 1" > ext/iconv/php_have_bsd_iconv.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BSD_ICONV 1
-_ACEOF
+$as_echo "#define HAVE_BSD_ICONV 1" >>confdefs.h
 
 
   echo "#define PHP_ICONV_IMPL \"BSD iconv\"" > ext/iconv/php_php_iconv_impl.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define PHP_ICONV_IMPL "BSD iconv"
-_ACEOF
+$as_echo "#define PHP_ICONV_IMPL \"BSD iconv\"" >>confdefs.h
 
         ;;
 
@@ -64064,17 +49591,13 @@ _ACEOF
   echo "#define HAVE_GLIBC_ICONV 1" > ext/iconv/php_have_glibc_iconv.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GLIBC_ICONV 1
-_ACEOF
+$as_echo "#define HAVE_GLIBC_ICONV 1" >>confdefs.h
 
 
   echo "#define PHP_ICONV_IMPL \"glibc\"" > ext/iconv/php_php_iconv_impl.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define PHP_ICONV_IMPL "glibc"
-_ACEOF
+$as_echo "#define PHP_ICONV_IMPL \"glibc\"" >>confdefs.h
 
         ;;
       ibm )
@@ -64082,42 +49605,32 @@ _ACEOF
   echo "#define HAVE_IBM_ICONV 1" > ext/iconv/php_have_ibm_iconv.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IBM_ICONV 1
-_ACEOF
+$as_echo "#define HAVE_IBM_ICONV 1" >>confdefs.h
 
 
   echo "#define PHP_ICONV_IMPL \"IBM iconv\"" > ext/iconv/php_php_iconv_impl.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define PHP_ICONV_IMPL "IBM iconv"
-_ACEOF
+$as_echo "#define PHP_ICONV_IMPL \"IBM iconv\"" >>confdefs.h
 
         ;;
     esac
 
-    { echo "$as_me:$LINENO: checking if iconv supports errno" >&5
-echo $ECHO_N "checking if iconv supports errno... $ECHO_C" >&6; }
-    if test "$cross_compiling" = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv supports errno" >&5
+$as_echo_n "checking if iconv supports errno... " >&6; }
+    if test "$cross_compiling" = yes; then :
 
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
   echo "#define ICONV_SUPPORTS_ERRNO 0" > ext/iconv/php_iconv_supports_errno.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define ICONV_SUPPORTS_ERRNO 0
-_ACEOF
+$as_echo "#define ICONV_SUPPORTS_ERRNO 0" >>confdefs.h
 
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <$PHP_ICONV_H_PATH>
@@ -64138,69 +49651,37 @@ int main() {
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
   echo "#define ICONV_SUPPORTS_ERRNO 1" > ext/iconv/php_iconv_supports_errno.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define ICONV_SUPPORTS_ERRNO 1
-_ACEOF
+$as_echo "#define ICONV_SUPPORTS_ERRNO 1" >>confdefs.h
 
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
   echo "#define ICONV_SUPPORTS_ERRNO 0" > ext/iconv/php_iconv_supports_errno.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define ICONV_SUPPORTS_ERRNO 0
-_ACEOF
+$as_echo "#define ICONV_SUPPORTS_ERRNO 0" >>confdefs.h
 
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
-
-    { echo "$as_me:$LINENO: checking if your cpp allows macro usage in include lines" >&5
-echo $ECHO_N "checking if your cpp allows macro usage in include lines... $ECHO_C" >&6; }
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if your cpp allows macro usage in include lines" >&5
+$as_echo_n "checking if your cpp allows macro usage in include lines... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #define FOO <$PHP_ICONV_H_PATH>
@@ -64214,26 +49695,10 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
   echo "#define PHP_ICONV_H_PATH <$PHP_ICONV_H_PATH>" > ext/iconv/php_php_iconv_h_path.h
 
@@ -64244,15 +49709,11 @@ _ACEOF
 
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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.$ac_ext
 
 
@@ -64570,9 +50031,7 @@ EOF
 
 
   else
-    { { echo "$as_me:$LINENO: error: Please reinstall the iconv library." >&5
-echo "$as_me: error: Please reinstall the iconv library." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Please reinstall the iconv library." "$LINENO" 5
   fi
 fi
 
@@ -64591,11 +50050,11 @@ fi
 
 php_with_imap=no
 
-{ echo "$as_me:$LINENO: checking for IMAP support" >&5
-echo $ECHO_N "checking for IMAP support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMAP support" >&5
+$as_echo_n "checking for IMAP support... " >&6; }
 
 # Check whether --with-imap was given.
-if test "${with_imap+set}" = set; then
+if test "${with_imap+set}" = set; then :
   withval=$with_imap; PHP_IMAP=$withval
 else
 
@@ -64627,8 +50086,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -64636,11 +50095,11 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_with_kerberos=no
 
-{ echo "$as_me:$LINENO: checking for IMAP Kerberos support" >&5
-echo $ECHO_N "checking for IMAP Kerberos support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMAP Kerberos support" >&5
+$as_echo_n "checking for IMAP Kerberos support... " >&6; }
 
 # Check whether --with-kerberos was given.
-if test "${with_kerberos+set}" = set; then
+if test "${with_kerberos+set}" = set; then :
   withval=$with_kerberos; PHP_KERBEROS=$withval
 else
 
@@ -64651,8 +50110,8 @@ fi
 
 
 ext_output=$PHP_KERBEROS
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -64660,11 +50119,11 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_with_imap_ssl=no
 
-{ echo "$as_me:$LINENO: checking for IMAP SSL support" >&5
-echo $ECHO_N "checking for IMAP SSL support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMAP SSL support" >&5
+$as_echo_n "checking for IMAP SSL support... " >&6; }
 
 # Check whether --with-imap-ssl was given.
-if test "${with_imap_ssl+set}" = set; then
+if test "${with_imap_ssl+set}" = set; then :
   withval=$with_imap_ssl; PHP_IMAP_SSL=$withval
 else
 
@@ -64675,8 +50134,8 @@ fi
 
 
 ext_output=$PHP_IMAP_SSL
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -64980,17 +50439,13 @@ EOF
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IMAP 1
-_ACEOF
+$as_echo "#define HAVE_IMAP 1" >>confdefs.h
 
 
     for i in $PHP_IMAP /usr/local /usr; do
       if test -r "$i/c-client.h"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IMAP2000 1
-_ACEOF
+$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i
@@ -65002,9 +50457,7 @@ _ACEOF
 
       elif test -r "$i/include/c-client/c-client.h"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IMAP2000 1
-_ACEOF
+$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/include/c-client
@@ -65016,9 +50469,7 @@ _ACEOF
 
       elif test -r "$i/include/imap/c-client.h"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IMAP2000 1
-_ACEOF
+$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/include/imap
@@ -65030,9 +50481,7 @@ _ACEOF
 
       elif test -r "$i/include/c-client.h"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IMAP2000 1
-_ACEOF
+$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/include
@@ -65044,9 +50493,7 @@ _ACEOF
 
       elif test -r "$i/imap/c-client.h"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IMAP2000 1
-_ACEOF
+$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/imap
@@ -65058,9 +50505,7 @@ _ACEOF
 
       elif test -r "$i/c-client/c-client.h"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IMAP2000 1
-_ACEOF
+$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/c-client
@@ -65073,40 +50518,30 @@ _ACEOF
       fi
     done
 
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <$IMAP_INC_DIR/mail.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "mail_fetch_overview_sequence" >/dev/null 2>&1; then
+  $EGREP "mail_fetch_overview_sequence" >/dev/null 2>&1; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IMAP2004 1
-_ACEOF
+$as_echo "#define HAVE_IMAP2004 1" >>confdefs.h
 
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 
         old_CFLAGS=$CFLAGS
     CFLAGS="-I$IMAP_INC_DIR"
-    { echo "$as_me:$LINENO: checking for utf8_mime2text signature" >&5
-echo $ECHO_N "checking for utf8_mime2text signature... $ECHO_C" >&6; }
-if test "${ac_cv_utf8_mime2text+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utf8_mime2text signature" >&5
+$as_echo_n "checking for utf8_mime2text signature... " >&6; }
+if test "${ac_cv_utf8_mime2text+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -65123,61 +50558,35 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
         ac_cv_utf8_mime2text=old
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
         ac_cv_utf8_mime2text=new
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_utf8_mime2text" >&5
-echo "${ECHO_T}$ac_cv_utf8_mime2text" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_utf8_mime2text" >&5
+$as_echo "$ac_cv_utf8_mime2text" >&6; }
     if test "$ac_cv_utf8_mime2text" = "new"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NEW_MIME2TEXT 1
-_ACEOF
+$as_echo "#define HAVE_NEW_MIME2TEXT 1" >>confdefs.h
 
     fi
     CFLAGS=$old_CFLAGS
 
     old_CFLAGS=$CFLAGS
     CFLAGS="-I$IMAP_INC_DIR"
-    { echo "$as_me:$LINENO: checking for U8T_DECOMPOSE" >&5
-echo $ECHO_N "checking for U8T_DECOMPOSE... $ECHO_C" >&6; }
-if test "${ac_cv_u8t_canonical+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for U8T_DECOMPOSE" >&5
+$as_echo_n "checking for U8T_DECOMPOSE... " >&6; }
+if test "${ac_cv_u8t_canonical+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <c-client.h>
@@ -65192,60 +50601,32 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
          ac_cv_u8t_decompose=yes
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
          ac_cv_u8t_decompose=no
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_u8t_canonical" >&5
-echo "${ECHO_T}$ac_cv_u8t_canonical" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_u8t_canonical" >&5
+$as_echo "$ac_cv_u8t_canonical" >&6; }
     CFLAGS=$old_CFLAGS
 
     if test "$ac_cv_u8t_decompose" = "no" && test "$ac_cv_utf8_mime2text" = "new"; then
-		{ { echo "$as_me:$LINENO: error: utf8_mime2text() has new signature, but U8T_CANONICAL is missing. This should not happen. Check config.log for additional information." >&5
-echo "$as_me: error: utf8_mime2text() has new signature, but U8T_CANONICAL is missing. This should not happen. Check config.log for additional information." >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error "utf8_mime2text() has new signature, but U8T_CANONICAL is missing. This should not happen. Check config.log for additional information." "$LINENO" 5
     fi
     if test "$ac_cv_u8t_decompose" = "yes" && test "$ac_cv_utf8_mime2text" = "old"; then
-		{ { echo "$as_me:$LINENO: error: utf8_mime2text() has old signature, but U8T_CANONICAL is present. This should not happen. Check config.log for additional information." >&5
-echo "$as_me: error: utf8_mime2text() has old signature, but U8T_CANONICAL is present. This should not happen. Check config.log for additional information." >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error "utf8_mime2text() has old signature, but U8T_CANONICAL is present. This should not happen. Check config.log for additional information." "$LINENO" 5
     fi
 
         old_CPPFLAGS=$CPPFLAGS
     CPPFLAGS=-I$IMAP_INC_DIR
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include "imap4r1.h"
@@ -65255,16 +50636,14 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "this_is_true" >/dev/null 2>&1; then
+  $EGREP "this_is_true" >/dev/null 2>&1; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IMAP2001 1
-_ACEOF
+$as_echo "#define HAVE_IMAP2001 1" >>confdefs.h
 
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
     CPPFLAGS=$old_CPPFLAGS
 
@@ -65328,10 +50707,10 @@ rm -f -r conftest*
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -65363,18 +50742,14 @@ rm -f -r conftest*
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
-echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pam_pam_start+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
+$as_echo_n "checking for pam_start in -lpam... " >&6; }
+if test "${ac_cv_lib_pam_pam_start+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpam  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -65392,39 +50767,18 @@ return pam_start ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pam_pam_start=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pam_pam_start=no
+  ac_cv_lib_pam_pam_start=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5
-echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6; }
-if test $ac_cv_lib_pam_pam_start = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5
+$as_echo "$ac_cv_lib_pam_pam_start" >&6; }
+if test "x$ac_cv_lib_pam_pam_start" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -65453,9 +50807,7 @@ if test $ac_cv_lib_pam_pam_start = yes; then
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBPAM 1
-_ACEOF
+$as_echo "#define HAVE_LIBPAM 1" >>confdefs.h
 
 
 
@@ -65529,10 +50881,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -65564,18 +50916,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
-if test "${ac_cv_lib_crypt_crypt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
+$as_echo_n "checking for crypt in -lcrypt... " >&6; }
+if test "${ac_cv_lib_crypt_crypt+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -65593,39 +50941,18 @@ return crypt ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_crypt_crypt=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_crypt_crypt=no
+  ac_cv_lib_crypt_crypt=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
-if test $ac_cv_lib_crypt_crypt = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
+$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
+if test "x$ac_cv_lib_crypt_crypt" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -65654,9 +50981,7 @@ if test $ac_cv_lib_crypt_crypt = yes; then
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBCRYPT 1
-_ACEOF
+$as_echo "#define HAVE_LIBCRYPT 1" >>confdefs.h
 
 
 
@@ -65675,22 +51000,20 @@ fi
     IMAP_DIR=$IMAP_DIR
   else
 
-    ep_dir="`echo $IMAP_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $IMAP_DIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    IMAP_DIR="$ep_realdir/`basename \"$IMAP_DIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    IMAP_DIR="$ep_realdir"/`basename "$IMAP_DIR"`
   fi
 
 
     if test -z "$IMAP_DIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find rfc822.h. Please check your c-client installation." >&5
-echo "$as_me: error: Cannot find rfc822.h. Please check your c-client installation." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Cannot find rfc822.h. Please check your c-client installation." "$LINENO" 5
     fi
 
-    if test -r "$IMAP_DIR/c-client/c-client.a"; then
+    if test ! -r "$IMAP_DIR/c-client/libc-client.a" && test -r "$IMAP_DIR/c-client/c-client.a" ; then
       ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
-    elif test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
+    elif test ! -r "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" && test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
       ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1
     fi
 
@@ -65711,9 +51034,7 @@ echo "$as_me: error: Cannot find rfc822.h. Please check your c-client installati
     done
 
     if test -z "$IMAP_LIBDIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find imap library (libc-client.a). Please check your c-client installation." >&5
-echo "$as_me: error: Cannot find imap library (libc-client.a). Please check your c-client installation." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Cannot find imap library (libc-client.a). Please check your c-client installation." "$LINENO" 5
     fi
 
 
@@ -65723,10 +51044,10 @@ echo "$as_me: error: Cannot find imap library (libc-client.a). Please check your
     ai_p=$IMAP_INC_DIR
   else
 
-    ep_dir="`echo $IMAP_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $IMAP_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$IMAP_INC_DIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$IMAP_INC_DIR"`
   fi
 
 
@@ -65777,10 +51098,10 @@ echo "$as_me: error: Cannot find imap library (libc-client.a). Please check your
     ai_p=$IMAP_LIBDIR
   else
 
-    ep_dir="`echo $IMAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $IMAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$IMAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$IMAP_LIBDIR"`
   fi
 
 
@@ -65818,10 +51139,10 @@ echo "$as_me: error: Cannot find imap library (libc-client.a). Please check your
     if test -z "$KRB5_CONFIG"; then
     # Extract the first word of "krb5-config", so it can be a program name with args.
 set dummy krb5-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_KRB5_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_KRB5_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $KRB5_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -65834,14 +51155,14 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_KRB5_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_KRB5_CONFIG" && ac_cv_path_KRB5_CONFIG="no"
@@ -65850,11 +51171,11 @@ esac
 fi
 KRB5_CONFIG=$ac_cv_path_KRB5_CONFIG
 if test -n "$KRB5_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $KRB5_CONFIG" >&5
-echo "${ECHO_T}$KRB5_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KRB5_CONFIG" >&5
+$as_echo "$KRB5_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -65920,10 +51241,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -65967,10 +51288,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -66020,10 +51341,10 @@ fi
     ai_p=$PHP_KERBEROS_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $PHP_KERBEROS_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_KERBEROS_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_KERBEROS_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_KERBEROS_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -66150,10 +51471,10 @@ fi
     ai_p=$PHP_KERBEROS_DIR/include
   else
 
-    ep_dir="`echo $PHP_KERBEROS_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_KERBEROS_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_KERBEROS_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_KERBEROS_DIR/include"`
   fi
 
 
@@ -66180,49 +51501,33 @@ fi
   if test "$found_kerberos" = "yes"; then
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IMAP_KRB 1
-_ACEOF
+$as_echo "#define HAVE_IMAP_KRB 1" >>confdefs.h
 
 
 else
-      { { echo "$as_me:$LINENO: error: Kerberos libraries not found.
+      as_fn_error "Kerberos libraries not found.
 
       Check the path given to --with-kerberos (if no path is given, searches in /usr/kerberos, /usr/local and /usr )
-      " >&5
-echo "$as_me: error: Kerberos libraries not found.
-
-      Check the path given to --with-kerberos (if no path is given, searches in /usr/kerberos, /usr/local and /usr )
-      " >&2;}
-   { (exit 1); exit 1; }; }
+      " "$LINENO" 5
 
   fi
 
   else
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <$IMAP_INC_DIR/linkage.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "auth_gss" >/dev/null 2>&1; then
+  $EGREP "auth_gss" >/dev/null 2>&1; then :
 
-      { { echo "$as_me:$LINENO: error: This c-client library is built with Kerberos support.
+      as_fn_error "This c-client library is built with Kerberos support.
 
       Add --with-kerberos to your configure line. Check config.log for details.
-      " >&5
-echo "$as_me: error: This c-client library is built with Kerberos support.
-
-      Add --with-kerberos to your configure line. Check config.log for details.
-      " >&2;}
-   { (exit 1); exit 1; }; }
+      " "$LINENO" 5
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
   fi
 
@@ -66248,10 +51553,10 @@ rm -f -r conftest*
     if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -66263,14 +51568,14 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
@@ -66279,11 +51584,11 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -66296,9 +51601,7 @@ fi
       OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl`
       OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl`
     else
-      { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5
-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "OpenSSL version 0.9.6 or greater required." "$LINENO" 5
     fi
 
     if test -n "$OPENSSL_LIBS"; then
@@ -66356,10 +51659,10 @@ echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -66405,10 +51708,10 @@ echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -66453,26 +51756,18 @@ echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
     done
 
     if test -z "$OPENSSL_INCDIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's <evp.h>" >&5
-echo "$as_me: error: Cannot find OpenSSL's <evp.h>" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Cannot find OpenSSL's <evp.h>" "$LINENO" 5
     fi
 
     if test -z "$OPENSSL_LIBDIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find OpenSSL's libraries" >&5
-echo "$as_me: error: Cannot find OpenSSL's libraries" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Cannot find OpenSSL's libraries" "$LINENO" 5
     fi
 
     old_CPPFLAGS=$CPPFLAGS
     CPPFLAGS=-I$OPENSSL_INCDIR
-    { echo "$as_me:$LINENO: checking for OpenSSL version" >&5
-echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6; }
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL version" >&5
+$as_echo_n "checking for OpenSSL version... " >&6; }
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <openssl/opensslv.h>
@@ -66482,19 +51777,17 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
+  $EGREP "yes" >/dev/null 2>&1; then :
 
-      { echo "$as_me:$LINENO: result: >= 0.9.6" >&5
-echo "${ECHO_T}>= 0.9.6" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: >= 0.9.6" >&5
+$as_echo ">= 0.9.6" >&6; }
 
 else
 
-      { { echo "$as_me:$LINENO: error: OpenSSL version 0.9.6 or greater required." >&5
-echo "$as_me: error: OpenSSL version 0.9.6 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "OpenSSL version 0.9.6 or greater required." "$LINENO" 5
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
     CPPFLAGS=$old_CPPFLAGS
 
@@ -66505,10 +51798,10 @@ rm -f -r conftest*
     ai_p=$OPENSSL_INCDIR
   else
 
-    ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$OPENSSL_INCDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$OPENSSL_INCDIR"`
   fi
 
 
@@ -66592,10 +51885,10 @@ rm -f -r conftest*
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -66627,18 +51920,14 @@ rm -f -r conftest*
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for CRYPTO_free in -lcrypto" >&5
-echo $ECHO_N "checking for CRYPTO_free in -lcrypto... $ECHO_C" >&6; }
-if test "${ac_cv_lib_crypto_CRYPTO_free+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CRYPTO_free in -lcrypto" >&5
+$as_echo_n "checking for CRYPTO_free in -lcrypto... " >&6; }
+if test "${ac_cv_lib_crypto_CRYPTO_free+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypto  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -66656,39 +51945,18 @@ return CRYPTO_free ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_crypto_CRYPTO_free=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_crypto_CRYPTO_free=no
+  ac_cv_lib_crypto_CRYPTO_free=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_CRYPTO_free" >&5
-echo "${ECHO_T}$ac_cv_lib_crypto_CRYPTO_free" >&6; }
-if test $ac_cv_lib_crypto_CRYPTO_free = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_CRYPTO_free" >&5
+$as_echo "$ac_cv_lib_crypto_CRYPTO_free" >&6; }
+if test "x$ac_cv_lib_crypto_CRYPTO_free" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -66724,9 +51992,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_crypto_CRYPTO_free
 
-      { { echo "$as_me:$LINENO: error: libcrypto not found!" >&5
-echo "$as_me: error: libcrypto not found!" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "libcrypto not found!" "$LINENO" 5
 
 
 fi
@@ -66796,10 +52062,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -66831,18 +52097,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for SSL_CTX_set_ssl_version in -lssl" >&5
-echo $ECHO_N "checking for SSL_CTX_set_ssl_version in -lssl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_set_ssl_version in -lssl" >&5
+$as_echo_n "checking for SSL_CTX_set_ssl_version in -lssl... " >&6; }
+if test "${ac_cv_lib_ssl_SSL_CTX_set_ssl_version+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lssl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -66860,39 +52122,18 @@ return SSL_CTX_set_ssl_version ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ssl_SSL_CTX_set_ssl_version=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_ssl_SSL_CTX_set_ssl_version=no
+  ac_cv_lib_ssl_SSL_CTX_set_ssl_version=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&5
-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&6; }
-if test $ac_cv_lib_ssl_SSL_CTX_set_ssl_version = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&5
+$as_echo "$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" >&6; }
+if test "x$ac_cv_lib_ssl_SSL_CTX_set_ssl_version" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -66906,9 +52147,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version
 
-      { { echo "$as_me:$LINENO: error: libssl not found!" >&5
-echo "$as_me: error: libssl not found!" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "libssl not found!" "$LINENO" 5
 
 
 fi
@@ -66968,10 +52207,10 @@ fi
     ai_p=$OPENSSL_LIBDIR
   else
 
-    ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$OPENSSL_LIBDIR"`
   fi
 
 
@@ -67007,49 +52246,33 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IMAP_SSL 1
-_ACEOF
+$as_echo "#define HAVE_IMAP_SSL 1" >>confdefs.h
 
 
 else
-      { { echo "$as_me:$LINENO: error: OpenSSL libraries not found.
+      as_fn_error "OpenSSL libraries not found.
 
       Check the path given to --with-openssl-dir and output in config.log)
-      " >&5
-echo "$as_me: error: OpenSSL libraries not found.
-
-      Check the path given to --with-openssl-dir and output in config.log)
-      " >&2;}
-   { (exit 1); exit 1; }; }
+      " "$LINENO" 5
 
   fi
 
   elif test -f "$IMAP_INC_DIR/linkage.c"; then
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <$IMAP_INC_DIR/linkage.c>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "ssl_onceonlyinit" >/dev/null 2>&1; then
+  $EGREP "ssl_onceonlyinit" >/dev/null 2>&1; then :
 
-      { { echo "$as_me:$LINENO: error: This c-client library is built with SSL support.
+      as_fn_error "This c-client library is built with SSL support.
 
       Add --with-imap-ssl to your configure line. Check config.log for details.
-      " >&5
-echo "$as_me: error: This c-client library is built with SSL support.
-
-      Add --with-imap-ssl to your configure line. Check config.log for details.
-      " >&2;}
-   { (exit 1); exit 1; }; }
+      " "$LINENO" 5
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
   fi
 
@@ -67060,16 +52283,12 @@ rm -f -r conftest*
 
   old_LIBS=$LIBS
   LIBS="$TST_LIBS $LIBS"
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
     LIBS=$old_LIBS
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -67102,48 +52321,23 @@ cat >>conftest.$ac_ext <<_ACEOF
     }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     LIBS=$old_LIBS
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IMAP_AUTH_GSS 1
-_ACEOF
+$as_echo "#define HAVE_IMAP_AUTH_GSS 1" >>confdefs.h
 
 
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     LIBS=$old_LIBS
 
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
@@ -67151,19 +52345,14 @@ fi
 
 
 
-
   old_LIBS=$LIBS
   LIBS="$TST_LIBS $LIBS"
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
     LIBS=$old_LIBS
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -67196,71 +52385,41 @@ cat >>conftest.$ac_ext <<_ACEOF
     }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     LIBS=$old_LIBS
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IMAP_MUTF7 1
-_ACEOF
+$as_echo "#define HAVE_IMAP_MUTF7 1" >>confdefs.h
 
 
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     LIBS=$old_LIBS
 
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
 
 
-
-    { echo "$as_me:$LINENO: checking whether rfc822_output_address_list function present" >&5
-echo $ECHO_N "checking whether rfc822_output_address_list function present... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether rfc822_output_address_list function present" >&5
+$as_echo_n "checking whether rfc822_output_address_list function present... " >&6; }
 
   old_LIBS=$LIBS
   LIBS="
       $TST_LIBS
      $LIBS"
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
     LIBS=$old_LIBS
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -67296,74 +52455,44 @@ cat >>conftest.$ac_ext <<_ACEOF
     }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     LIBS=$old_LIBS
 
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_RFC822_OUTPUT_ADDRESS_LIST 1
-_ACEOF
+$as_echo "#define HAVE_RFC822_OUTPUT_ADDRESS_LIST 1" >>confdefs.h
 
 
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     LIBS=$old_LIBS
 
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
 
-
-    { echo "$as_me:$LINENO: checking whether build with IMAP works" >&5
-echo $ECHO_N "checking whether build with IMAP works... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build with IMAP works" >&5
+$as_echo_n "checking whether build with IMAP works... " >&6; }
 
 
   old_LIBS=$LIBS
   LIBS="$TST_LIBS $LIBS"
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
     LIBS=$old_LIBS
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -67396,67 +52525,41 @@ cat >>conftest.$ac_ext <<_ACEOF
     }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     LIBS=$old_LIBS
 
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     LIBS=$old_LIBS
 
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-      { { echo "$as_me:$LINENO: error: build test failed. Please check the config.log for details." >&5
-echo "$as_me: error: build test failed. Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+      as_fn_error "build test failed. Please check the config.log for details." "$LINENO" 5
 
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
 
-
 fi
 
 
 
 php_with_interbase=no
 
-{ echo "$as_me:$LINENO: checking for InterBase support" >&5
-echo $ECHO_N "checking for InterBase support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for InterBase support" >&5
+$as_echo_n "checking for InterBase support... " >&6; }
 
 # Check whether --with-interbase was given.
-if test "${with_interbase+set}" = set; then
+if test "${with_interbase+set}" = set; then :
   withval=$with_interbase; PHP_INTERBASE=$withval
 else
 
@@ -67488,8 +52591,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -67565,10 +52668,10 @@ if test "$PHP_INTERBASE" != "no"; then
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -67600,18 +52703,14 @@ if test "$PHP_INTERBASE" != "no"; then
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for isc_detach_database in -lfbclient" >&5
-echo $ECHO_N "checking for isc_detach_database in -lfbclient... $ECHO_C" >&6; }
-if test "${ac_cv_lib_fbclient_isc_detach_database+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lfbclient" >&5
+$as_echo_n "checking for isc_detach_database in -lfbclient... " >&6; }
+if test "${ac_cv_lib_fbclient_isc_detach_database+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfbclient  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -67629,39 +52728,18 @@ return isc_detach_database ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_fbclient_isc_detach_database=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_fbclient_isc_detach_database=no
+  ac_cv_lib_fbclient_isc_detach_database=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_fbclient_isc_detach_database" >&5
-echo "${ECHO_T}$ac_cv_lib_fbclient_isc_detach_database" >&6; }
-if test $ac_cv_lib_fbclient_isc_detach_database = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fbclient_isc_detach_database" >&5
+$as_echo "$ac_cv_lib_fbclient_isc_detach_database" >&6; }
+if test "x$ac_cv_lib_fbclient_isc_detach_database" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -67737,10 +52815,10 @@ else
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -67772,18 +52850,14 @@ else
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for isc_detach_database in -lgds" >&5
-echo $ECHO_N "checking for isc_detach_database in -lgds... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gds_isc_detach_database+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lgds" >&5
+$as_echo_n "checking for isc_detach_database in -lgds... " >&6; }
+if test "${ac_cv_lib_gds_isc_detach_database+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgds  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -67801,39 +52875,18 @@ return isc_detach_database ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gds_isc_detach_database=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gds_isc_detach_database=no
+  ac_cv_lib_gds_isc_detach_database=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gds_isc_detach_database" >&5
-echo "${ECHO_T}$ac_cv_lib_gds_isc_detach_database" >&6; }
-if test $ac_cv_lib_gds_isc_detach_database = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gds_isc_detach_database" >&5
+$as_echo "$ac_cv_lib_gds_isc_detach_database" >&6; }
+if test "x$ac_cv_lib_gds_isc_detach_database" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -67909,10 +52962,10 @@ else
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -67944,18 +52997,14 @@ else
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for isc_detach_database in -lib_util" >&5
-echo $ECHO_N "checking for isc_detach_database in -lib_util... $ECHO_C" >&6; }
-if test "${ac_cv_lib_ib_util_isc_detach_database+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lib_util" >&5
+$as_echo_n "checking for isc_detach_database in -lib_util... " >&6; }
+if test "${ac_cv_lib_ib_util_isc_detach_database+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lib_util  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -67973,39 +53022,18 @@ return isc_detach_database ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ib_util_isc_detach_database=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_ib_util_isc_detach_database=no
+  ac_cv_lib_ib_util_isc_detach_database=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ib_util_isc_detach_database" >&5
-echo "${ECHO_T}$ac_cv_lib_ib_util_isc_detach_database" >&6; }
-if test $ac_cv_lib_ib_util_isc_detach_database = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ib_util_isc_detach_database" >&5
+$as_echo "$ac_cv_lib_ib_util_isc_detach_database" >&6; }
+if test "x$ac_cv_lib_ib_util_isc_detach_database" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -68019,9 +53047,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_ib_util_isc_detach_database
 
-        { { echo "$as_me:$LINENO: error: libgds, libib_util or libfbclient not found! Check config.log for more information." >&5
-echo "$as_me: error: libgds, libib_util or libfbclient not found! Check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error "libgds, libib_util or libfbclient not found! Check config.log for more information." "$LINENO" 5
 
 
 fi
@@ -68047,10 +53073,10 @@ fi
     ai_p=$IBASE_LIBDIR
   else
 
-    ep_dir="`echo $IBASE_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $IBASE_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$IBASE_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$IBASE_LIBDIR"`
   fi
 
 
@@ -68090,10 +53116,10 @@ fi
     ai_p=$IBASE_LIBDIR
   else
 
-    ep_dir="`echo $IBASE_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $IBASE_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$IBASE_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$IBASE_LIBDIR"`
   fi
 
 
@@ -68139,10 +53165,10 @@ fi
     ai_p=$IBASE_INCDIR
   else
 
-    ep_dir="`echo $IBASE_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $IBASE_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$IBASE_INCDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$IBASE_INCDIR"`
   fi
 
 
@@ -68164,9 +53190,7 @@ fi
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IBASE 1
-_ACEOF
+$as_echo "#define HAVE_IBASE 1" >>confdefs.h
 
 
   ext_builddir=ext/interbase
@@ -68470,10 +53494,10 @@ fi
 
 php_enable_intl=no
 
-{ echo "$as_me:$LINENO: checking whether to enable internationalization support" >&5
-echo $ECHO_N "checking whether to enable internationalization support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable internationalization support" >&5
+$as_echo_n "checking whether to enable internationalization support... " >&6; }
 # Check whether --enable-intl was given.
-if test "${enable_intl+set}" = set; then
+if test "${enable_intl+set}" = set; then :
   enableval=$enable_intl; PHP_INTL=$enableval
 else
 
@@ -68505,8 +53529,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -68519,7 +53543,7 @@ php_with_icu_dir=DEFAULT
 
 
 # Check whether --with-icu-dir was given.
-if test "${with_icu_dir+set}" = set; then
+if test "${with_icu_dir+set}" = set; then :
   withval=$with_icu_dir; PHP_ICU_DIR=$withval
 else
 
@@ -68542,10 +53566,10 @@ ext_output=$PHP_ICU_DIR
   if test "$PHP_ICU_DIR" = "DEFAULT"; then
         # Extract the first word of "icu-config", so it can be a program name with args.
 set dummy icu-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_ICU_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ICU_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $ICU_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -68558,14 +53582,14 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ICU_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_ICU_CONFIG" && ac_cv_path_ICU_CONFIG="no"
@@ -68574,11 +53598,11 @@ esac
 fi
 ICU_CONFIG=$ac_cv_path_ICU_CONFIG
 if test -n "$ICU_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $ICU_CONFIG" >&5
-echo "${ECHO_T}$ICU_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ICU_CONFIG" >&5
+$as_echo "$ICU_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -68586,35 +53610,31 @@ fi
     ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config"
   fi
 
-  { echo "$as_me:$LINENO: checking for location of ICU headers and libraries" >&5
-echo $ECHO_N "checking for location of ICU headers and libraries... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of ICU headers and libraries" >&5
+$as_echo_n "checking for location of ICU headers and libraries... " >&6; }
 
     icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null`
   if test "$?" != "0" || test -z "$icu_install_prefix"; then
-    { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-    { { echo "$as_me:$LINENO: error: Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works." >&5
-echo "$as_me: error: Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works." >&2;}
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+    as_fn_error "Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works." "$LINENO" 5
   else
-    { echo "$as_me:$LINENO: result: $icu_install_prefix" >&5
-echo "${ECHO_T}$icu_install_prefix" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $icu_install_prefix" >&5
+$as_echo "$icu_install_prefix" >&6; }
 
-        { echo "$as_me:$LINENO: checking for ICU 3.4 or greater" >&5
-echo $ECHO_N "checking for ICU 3.4 or greater... $ECHO_C" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICU 3.4 or greater" >&5
+$as_echo_n "checking for ICU 3.4 or greater... " >&6; }
     icu_version_full=`$ICU_CONFIG --version`
     ac_IFS=$IFS
     IFS="."
     set $icu_version_full
     IFS=$ac_IFS
     icu_version=`expr $1 \* 1000 + $2`
-    { echo "$as_me:$LINENO: result: found $icu_version_full" >&5
-echo "${ECHO_T}found $icu_version_full" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $icu_version_full" >&5
+$as_echo "found $icu_version_full" >&6; }
 
     if test "$icu_version" -lt "3004"; then
-      { { echo "$as_me:$LINENO: error: ICU version 3.4 or later is required" >&5
-echo "$as_me: error: ICU version 3.4 or later is required" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "ICU version 3.4 or later is required" "$LINENO" 5
     fi
 
     ICU_VERSION=$icu_version
@@ -68632,10 +53652,10 @@ echo "$as_me: error: ICU version 3.4 or later is required" >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -68714,10 +53734,10 @@ echo "$as_me: error: ICU version 3.4 or later is required" >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -68770,10 +53790,10 @@ if test -z "$CXX"; 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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CXX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -68783,25 +53803,25 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -68814,10 +53834,10 @@ 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
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; 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.
@@ -68827,25 +53847,25 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -68857,12 +53877,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&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
@@ -68872,49 +53888,36 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&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; do
+  { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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 test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -68928,54 +53931,34 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
    ac_cv_prog_cxx_g=no
    CXXFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -68986,34 +53969,11 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CXXFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  CXXFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -69024,35 +53984,12 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_compile "$LINENO"; then :
 
-	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -69063,42 +54000,18 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -69125,11 +54038,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&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; }
 if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
     for CXXCPP in "$CXX -E" "/lib/cpp"
@@ -69143,11 +54056,7 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -69156,76 +54065,34 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+if $ac_preproc_ok; then :
   break
 fi
 
@@ -69237,8 +54104,8 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -69248,11 +54115,7 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -69261,83 +54124,40 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+if $ac_preproc_ok; then :
+
 else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $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 \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -69922,10 +54742,10 @@ fi
 
 php_enable_json=yes
 
-{ echo "$as_me:$LINENO: checking whether to enable JavaScript Object Serialization support" >&5
-echo $ECHO_N "checking whether to enable JavaScript Object Serialization support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable JavaScript Object Serialization support" >&5
+$as_echo_n "checking whether to enable JavaScript Object Serialization support... " >&6; }
 # Check whether --enable-json was given.
-if test "${enable_json+set}" = set; then
+if test "${enable_json+set}" = set; then :
   enableval=$enable_json; PHP_JSON=$enableval
 else
 
@@ -69957,28 +54777,22 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_JSON" != "no"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_JSON 1
-_ACEOF
+$as_echo "#define HAVE_JSON 1 " >>confdefs.h
 
-  { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $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 test "${ac_cv_header_stdc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -69993,85 +54807,53 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
+  ac_cv_header_stdc=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
-rm -f -r conftest*
+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 >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -70098,48 +54880,22 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&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
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
@@ -70470,11 +55226,11 @@ fi
 
 php_with_ldap=no
 
-{ echo "$as_me:$LINENO: checking for LDAP support" >&5
-echo $ECHO_N "checking for LDAP support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LDAP support" >&5
+$as_echo_n "checking for LDAP support... " >&6; }
 
 # Check whether --with-ldap was given.
-if test "${with_ldap+set}" = set; then
+if test "${with_ldap+set}" = set; then :
   withval=$with_ldap; PHP_LDAP=$withval
 else
 
@@ -70506,8 +55262,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -70515,11 +55271,11 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_with_ldap_sasl=no
 
-{ echo "$as_me:$LINENO: checking for LDAP Cyrus SASL support" >&5
-echo $ECHO_N "checking for LDAP Cyrus SASL support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LDAP Cyrus SASL support" >&5
+$as_echo_n "checking for LDAP Cyrus SASL support... " >&6; }
 
 # Check whether --with-ldap-sasl was given.
-if test "${with_ldap_sasl+set}" = set; then
+if test "${with_ldap_sasl+set}" = set; then :
   withval=$with_ldap_sasl; PHP_LDAP_SASL=$withval
 else
 
@@ -70530,8 +55286,8 @@ fi
 
 
 ext_output=$PHP_LDAP_SASL
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -70869,9 +55625,7 @@ EOF
   fi
 
   if test -z "$LDAP_DIR"; then
-    { { echo "$as_me:$LINENO: error: Cannot find ldap.h" >&5
-echo "$as_me: error: Cannot find ldap.h" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Cannot find ldap.h" "$LINENO" 5
   fi
 
 
@@ -70894,10 +55648,10 @@ echo "$as_me: error: Cannot find ldap.h" >&2;}
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -70937,10 +55691,10 @@ echo "$as_me: error: Cannot find ldap.h" >&2;}
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -70991,10 +55745,10 @@ echo "$as_me: error: Cannot find ldap.h" >&2;}
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -71034,10 +55788,10 @@ echo "$as_me: error: Cannot find ldap.h" >&2;}
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -71090,10 +55844,10 @@ echo "$as_me: error: Cannot find ldap.h" >&2;}
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -71133,10 +55887,10 @@ echo "$as_me: error: Cannot find ldap.h" >&2;}
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -71201,10 +55955,10 @@ echo "$as_me: error: Cannot find ldap.h" >&2;}
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -71244,10 +55998,10 @@ echo "$as_me: error: Cannot find ldap.h" >&2;}
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -71298,10 +56052,10 @@ echo "$as_me: error: Cannot find ldap.h" >&2;}
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -71341,10 +56095,10 @@ echo "$as_me: error: Cannot find ldap.h" >&2;}
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -71395,10 +56149,10 @@ echo "$as_me: error: Cannot find ldap.h" >&2;}
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -71438,10 +56192,10 @@ echo "$as_me: error: Cannot find ldap.h" >&2;}
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -71492,10 +56246,10 @@ echo "$as_me: error: Cannot find ldap.h" >&2;}
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -71535,10 +56289,10 @@ echo "$as_me: error: Cannot find ldap.h" >&2;}
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -71589,10 +56343,10 @@ echo "$as_me: error: Cannot find ldap.h" >&2;}
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -71632,10 +56386,10 @@ echo "$as_me: error: Cannot find ldap.h" >&2;}
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -71686,10 +56440,10 @@ echo "$as_me: error: Cannot find ldap.h" >&2;}
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -71729,10 +56483,10 @@ echo "$as_me: error: Cannot find ldap.h" >&2;}
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -71783,10 +56537,10 @@ echo "$as_me: error: Cannot find ldap.h" >&2;}
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -71826,10 +56580,10 @@ echo "$as_me: error: Cannot find ldap.h" >&2;}
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -71869,9 +56623,7 @@ echo "$as_me: error: Cannot find ldap.h" >&2;}
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NSLDAP 1
-_ACEOF
+$as_echo "#define HAVE_NSLDAP 1" >>confdefs.h
 
 
   elif test -f $LDAP_LIBDIR/libldapssl41.$SHLIB_SUFFIX_NAME; then
@@ -71899,10 +56651,10 @@ _ACEOF
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -71942,10 +56694,10 @@ _ACEOF
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -71996,10 +56748,10 @@ _ACEOF
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -72039,10 +56791,10 @@ _ACEOF
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -72093,10 +56845,10 @@ _ACEOF
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -72136,10 +56888,10 @@ _ACEOF
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -72190,10 +56942,10 @@ _ACEOF
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -72233,10 +56985,10 @@ _ACEOF
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -72276,9 +57028,7 @@ _ACEOF
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NSLDAP 1
-_ACEOF
+$as_echo "#define HAVE_NSLDAP 1" >>confdefs.h
 
 
   elif test -f $LDAP_LIBDIR/libldapssl30.$SHLIB_SUFFIX_NAME; then
@@ -72306,10 +57056,10 @@ _ACEOF
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -72349,10 +57099,10 @@ _ACEOF
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -72392,9 +57142,7 @@ _ACEOF
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NSLDAP 1
-_ACEOF
+$as_echo "#define HAVE_NSLDAP 1" >>confdefs.h
 
 
   elif test -f $LDAP_LIBDIR/libldap30.$SHLIB_SUFFIX_NAME; then
@@ -72422,10 +57170,10 @@ _ACEOF
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -72465,10 +57213,10 @@ _ACEOF
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -72508,9 +57256,7 @@ _ACEOF
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NSLDAP 1
-_ACEOF
+$as_echo "#define HAVE_NSLDAP 1" >>confdefs.h
 
 
   elif test -f $LDAP_LIBDIR/libumich_ldap.$SHLIB_SUFFIX_NAME; then
@@ -72526,10 +57272,10 @@ _ACEOF
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -72569,10 +57315,10 @@ _ACEOF
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -72623,10 +57369,10 @@ _ACEOF
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -72666,10 +57412,10 @@ _ACEOF
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -72722,10 +57468,10 @@ _ACEOF
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -72765,10 +57511,10 @@ _ACEOF
     ai_p=$LDAP_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_LIBDIR"`
   fi
 
 
@@ -72808,21 +57554,15 @@ _ACEOF
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ORALDAP 1
-_ACEOF
+$as_echo "#define HAVE_ORALDAP 1" >>confdefs.h
 
     if test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ORALDAP_10 1
-_ACEOF
+$as_echo "#define HAVE_ORALDAP_10 1" >>confdefs.h
 
     fi
   else
-    { { echo "$as_me:$LINENO: error: Cannot find ldap libraries in $LDAP_LIBDIR." >&5
-echo "$as_me: error: Cannot find ldap libraries in $LDAP_LIBDIR." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Cannot find ldap libraries in $LDAP_LIBDIR." "$LINENO" 5
   fi
 
 
@@ -72832,10 +57572,10 @@ echo "$as_me: error: Cannot find ldap libraries in $LDAP_LIBDIR." >&2;}
     ai_p=$LDAP_INCDIR
   else
 
-    ep_dir="`echo $LDAP_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_INCDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_INCDIR"`
   fi
 
 
@@ -72860,9 +57600,7 @@ echo "$as_me: error: Cannot find ldap libraries in $LDAP_LIBDIR." >&2;}
   PHP_VAR_SUBST="$PHP_VAR_SUBST LDAP_SHARED_LIBADD"
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LDAP 1
-_ACEOF
+$as_echo "#define HAVE_LDAP 1" >>confdefs.h
 
 
     _SAVE_CPPFLAGS=$CPPFLAGS
@@ -72870,16 +57608,12 @@ _ACEOF
   CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR"
   LIBS="$LIBS $LDAP_SHARED_LIBADD"
 
-    { echo "$as_me:$LINENO: checking for 3 arg ldap_set_rebind_proc" >&5
-echo $ECHO_N "checking for 3 arg ldap_set_rebind_proc... $ECHO_C" >&6; }
-if test "${ac_cv_3arg_setrebindproc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 3 arg ldap_set_rebind_proc" >&5
+$as_echo_n "checking for 3 arg ldap_set_rebind_proc... " >&6; }
+if test "${ac_cv_3arg_setrebindproc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ldap.h>
 int
@@ -72890,134 +57624,29 @@ ldap_set_rebind_proc(0,0,0)
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_3arg_setrebindproc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_3arg_setrebindproc=no
+  ac_cv_3arg_setrebindproc=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_3arg_setrebindproc" >&5
-echo "${ECHO_T}$ac_cv_3arg_setrebindproc" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_3arg_setrebindproc" >&5
+$as_echo "$ac_cv_3arg_setrebindproc" >&6; }
   if test "$ac_cv_3arg_setrebindproc" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_3ARG_SETREBINDPROC 1
-_ACEOF
+$as_echo "#define HAVE_3ARG_SETREBINDPROC 1" >>confdefs.h
 
   fi
 
-
-
-
-for ac_func in ldap_parse_result ldap_parse_reference ldap_start_tls_s
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+      for ac_func in ldap_parse_result ldap_parse_reference ldap_start_tls_s
+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"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -73036,17 +57665,13 @@ done
     if test -f $i/include/sasl/sasl.h; then
       LDAP_SASL_DIR=$i
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LDAP_SASL_SASL_H 1
-_ACEOF
+$as_echo "#define HAVE_LDAP_SASL_SASL_H 1" >>confdefs.h
 
       break
     elif test -f $i/include/sasl.h; then
       LDAP_SASL_DIR=$i
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LDAP_SASL_H 1
-_ACEOF
+$as_echo "#define HAVE_LDAP_SASL_H 1" >>confdefs.h
 
       break
     fi
@@ -73056,9 +57681,7 @@ _ACEOF
     LDAP_SASL_INCDIR=$LDAP_SASL_DIR/include
     LDAP_SASL_LIBDIR=$LDAP_SASL_DIR/$PHP_LIBDIR
   else
-    { { echo "$as_me:$LINENO: error: sasl.h not found!" >&5
-echo "$as_me: error: sasl.h not found!" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "sasl.h not found!" "$LINENO" 5
   fi
 
   if test "$PHP_LDAP_SASL" = "yes"; then
@@ -73129,10 +57752,10 @@ echo "$as_me: error: sasl.h not found!" >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -73164,18 +57787,14 @@ echo "$as_me: error: sasl.h not found!" >&2;}
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for sasl_version in -lsasl2" >&5
-echo $ECHO_N "checking for sasl_version in -lsasl2... $ECHO_C" >&6; }
-if test "${ac_cv_lib_sasl2_sasl_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sasl_version in -lsasl2" >&5
+$as_echo_n "checking for sasl_version in -lsasl2... " >&6; }
+if test "${ac_cv_lib_sasl2_sasl_version+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsasl2  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -73193,39 +57812,18 @@ return sasl_version ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sasl2_sasl_version=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_sasl2_sasl_version=no
+  ac_cv_lib_sasl2_sasl_version=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_version" >&5
-echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_version" >&6; }
-if test $ac_cv_lib_sasl2_sasl_version = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sasl2_sasl_version" >&5
+$as_echo "$ac_cv_lib_sasl2_sasl_version" >&6; }
+if test "x$ac_cv_lib_sasl2_sasl_version" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -73237,10 +57835,10 @@ if test $ac_cv_lib_sasl2_sasl_version = yes; then
     ai_p=$LDAP_SASL_INCDIR
   else
 
-    ep_dir="`echo $LDAP_SASL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_SASL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_SASL_INCDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_SASL_INCDIR"`
   fi
 
 
@@ -73273,10 +57871,10 @@ if test $ac_cv_lib_sasl2_sasl_version = yes; then
     ai_p=$LDAP_SASL_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_SASL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_SASL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_SASL_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_SASL_LIBDIR"`
   fi
 
 
@@ -73316,10 +57914,10 @@ if test $ac_cv_lib_sasl2_sasl_version = yes; then
     ai_p=$LDAP_SASL_LIBDIR
   else
 
-    ep_dir="`echo $LDAP_SASL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LDAP_SASL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LDAP_SASL_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LDAP_SASL_LIBDIR"`
   fi
 
 
@@ -73359,9 +57957,7 @@ if test $ac_cv_lib_sasl2_sasl_version = yes; then
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LDAP_SASL 1
-_ACEOF
+$as_echo "#define HAVE_LDAP_SASL 1" >>confdefs.h
 
 
 
@@ -73371,9 +57967,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sasl2_sasl_version
 
-    { { echo "$as_me:$LINENO: error: LDAP SASL check failed. Please check config.log for more information." >&5
-echo "$as_me: error: LDAP SASL check failed. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "LDAP SASL check failed. Please check config.log for more information." "$LINENO" 5
 
 
 fi
@@ -73381,94 +57975,12 @@ fi
 
   fi
 
-        { echo "$as_me:$LINENO: checking for ldap_bind_s" >&5
-echo $ECHO_N "checking for ldap_bind_s... $ECHO_C" >&6; }
-if test "${ac_cv_func_ldap_bind_s+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define ldap_bind_s to an innocuous variant, in case <limits.h> declares ldap_bind_s.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define ldap_bind_s innocuous_ldap_bind_s
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char ldap_bind_s (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef ldap_bind_s
-
-/* 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 ldap_bind_s ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_ldap_bind_s || defined __stub___ldap_bind_s
-choke me
-#endif
-
-int
-main ()
-{
-return ldap_bind_s ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_ldap_bind_s=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_ldap_bind_s=no
-fi
+        ac_fn_c_check_func "$LINENO" "ldap_bind_s" "ac_cv_func_ldap_bind_s"
+if test "x$ac_cv_func_ldap_bind_s" = x""yes; then :
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_ldap_bind_s" >&5
-echo "${ECHO_T}$ac_cv_func_ldap_bind_s" >&6; }
-if test $ac_cv_func_ldap_bind_s = yes; then
-  :
 else
 
-    { { echo "$as_me:$LINENO: error: LDAP build check failed. Please check config.log for more information." >&5
-echo "$as_me: error: LDAP build check failed. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "LDAP build check failed. Please check config.log for more information." "$LINENO" 5
 
 fi
 
@@ -73502,10 +58014,10 @@ fi
 
 php_enable_mbstring=no
 
-{ echo "$as_me:$LINENO: checking whether to enable multibyte string support" >&5
-echo $ECHO_N "checking whether to enable multibyte string support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable multibyte string support" >&5
+$as_echo_n "checking whether to enable multibyte string support... " >&6; }
 # Check whether --enable-mbstring was given.
-if test "${enable_mbstring+set}" = set; then
+if test "${enable_mbstring+set}" = set; then :
   enableval=$enable_mbstring; PHP_MBSTRING=$enableval
 else
 
@@ -73537,8 +58049,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -73546,10 +58058,10 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_enable_mbregex=yes
 
-{ echo "$as_me:$LINENO: checking whether to enable multibyte regex support" >&5
-echo $ECHO_N "checking whether to enable multibyte regex support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable multibyte regex support" >&5
+$as_echo_n "checking whether to enable multibyte regex support... " >&6; }
 # Check whether --enable-mbregex was given.
-if test "${enable_mbregex+set}" = set; then
+if test "${enable_mbregex+set}" = set; then :
   enableval=$enable_mbregex; PHP_MBREGEX=$enableval
 else
 
@@ -73560,8 +58072,8 @@ fi
 
 
 ext_output=$PHP_MBREGEX
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -73569,10 +58081,10 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_enable_mbregex_backtrack=yes
 
-{ echo "$as_me:$LINENO: checking whether to check multibyte regex backtrack" >&5
-echo $ECHO_N "checking whether to check multibyte regex backtrack... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to check multibyte regex backtrack" >&5
+$as_echo_n "checking whether to check multibyte regex backtrack... " >&6; }
 # Check whether --enable-mbregex_backtrack was given.
-if test "${enable_mbregex_backtrack+set}" = set; then
+if test "${enable_mbregex_backtrack+set}" = set; then :
   enableval=$enable_mbregex_backtrack; PHP_MBREGEX_BACKTRACK=$enableval
 else
 
@@ -73583,8 +58095,8 @@ fi
 
 
 ext_output=$PHP_MBREGEX_BACKTRACK
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -73592,11 +58104,11 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_with_libmbfl=no
 
-{ echo "$as_me:$LINENO: checking for external libmbfl" >&5
-echo $ECHO_N "checking for external libmbfl... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for external libmbfl" >&5
+$as_echo_n "checking for external libmbfl... " >&6; }
 
 # Check whether --with-libmbfl was given.
-if test "${with_libmbfl+set}" = set; then
+if test "${with_libmbfl+set}" = set; then :
   withval=$with_libmbfl; PHP_LIBMBFL=$withval
 else
 
@@ -73607,8 +58119,8 @@ fi
 
 
 ext_output=$PHP_LIBMBFL
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -73616,11 +58128,11 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_with_onig=no
 
-{ echo "$as_me:$LINENO: checking for external oniguruma" >&5
-echo $ECHO_N "checking for external oniguruma... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for external oniguruma" >&5
+$as_echo_n "checking for external oniguruma... " >&6; }
 
 # Check whether --with-onig was given.
-if test "${with_onig+set}" = set; then
+if test "${with_onig+set}" = set; then :
   withval=$with_onig; PHP_ONIG=$withval
 else
 
@@ -73631,17 +58143,15 @@ fi
 
 
 ext_output=$PHP_ONIG
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_MBSTRING" != "no"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MBSTRING 1
-_ACEOF
+$as_echo "#define HAVE_MBSTRING 1" >>confdefs.h
 
 
 
@@ -73654,19 +58164,17 @@ _ACEOF
     if test "$PHP_ONIG" = "yes" || test "$PHP_ONIG" = "no"; then
                         if test "$PHP_MBREGEX_BACKTRACK" != "no"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_COMBINATION_EXPLOSION_CHECK 1
-_ACEOF
+$as_echo "#define USE_COMBINATION_EXPLOSION_CHECK 1" >>confdefs.h
 
       fi
 
-      { echo "$as_me:$LINENO: checking for variable length prototypes and stdarg.h" >&5
-echo $ECHO_N "checking for variable length prototypes and stdarg.h... $ECHO_C" >&6; }
-if test "${php_cv_mbstring_stdarg+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&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; }
+if test "${php_cv_mbstring_stdarg+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-        if test "$cross_compiling" = yes; then
+        if test "$cross_compiling" = yes; then :
 
                     case $host_alias in
           *netware*)
@@ -73678,11 +58186,7 @@ else
           esac
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdarg.h>
@@ -73697,587 +58201,60 @@ int foo(int x, ...) {
 int main() { return foo(10, "", 3.14); }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   php_cv_mbstring_stdarg=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-php_cv_mbstring_stdarg=no
+  php_cv_mbstring_stdarg=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
-
 fi
-{ echo "$as_me:$LINENO: result: $php_cv_mbstring_stdarg" >&5
-echo "${ECHO_T}$php_cv_mbstring_stdarg" >&6; }
-
-
-
-
-
-
-
-
-for ac_header in stdlib.h string.h strings.h unistd.h sys/time.h sys/times.h stdarg.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_mbstring_stdarg" >&5
+$as_echo "$php_cv_mbstring_stdarg" >&6; }
 
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+      for ac_header in stdlib.h string.h strings.h unistd.h sys/time.h sys/times.h stdarg.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"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-      { echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6; }
-if test "${ac_cv_type_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef int ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
+      # 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.
-{ echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
+if test "${ac_cv_sizeof_int+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
 
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_int=$ac_lo;;
-'') if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_int=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (int)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_int=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$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; }
 
 
 
@@ -74286,403 +58263,32 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-      { echo "$as_me:$LINENO: checking for short" >&5
-echo $ECHO_N "checking for short... $ECHO_C" >&6; }
-if test "${ac_cv_type_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef short ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_short=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_short=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-echo "${ECHO_T}$ac_cv_type_short" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
+      # 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.
-{ echo "$as_me:$LINENO: checking size of short" >&5
-echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_short+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
+$as_echo_n "checking size of short... " >&6; }
+if test "${ac_cv_sizeof_short+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
 
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef short ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_short=$ac_lo;;
-'') if test "$ac_cv_type_short" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_short=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef short ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_short=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_short" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (short)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_short" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (short)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_short=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-echo "${ECHO_T}$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; }
 
 
 
@@ -74691,403 +58297,32 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-      { echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
+      # 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.
-{ echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if test "${ac_cv_sizeof_long+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
 
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long=$ac_lo;;
-'') if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_long=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$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; }
 
 
 
@@ -75096,16 +58331,12 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-      { echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
-if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+      { $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 test "${ac_cv_c_const+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -75165,53 +58396,27 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_const=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_c_const=no
+  ac_cv_c_const=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$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
 
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
+$as_echo "#define const /**/" >>confdefs.h
 
 fi
 
-      { echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
-if test "${ac_cv_header_time+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+      { $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 test "${ac_cv_header_time+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/time.h>
@@ -75226,55 +58431,29 @@ return 0;
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_time=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_time=no
+  ac_cv_header_time=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6; }
+{ $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
 
-cat >>confdefs.h <<\_ACEOF
-#define TIME_WITH_SYS_TIME 1
-_ACEOF
+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
 
 fi
 
       # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ echo "$as_me:$LINENO: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if test "${ac_cv_working_alloca_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <alloca.h>
 int
@@ -75286,55 +58465,28 @@ char *p = (char *) alloca (2 * sizeof (int));
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_working_alloca_h=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_working_alloca_h=no
+  ac_cv_working_alloca_h=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA_H 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if test "${ac_cv_func_alloca_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -75366,43 +58518,20 @@ char *p = (char *) alloca (1);
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_func_alloca_works=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_alloca_works=no
+  ac_cv_func_alloca_works=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
 
 else
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -75412,21 +58541,15 @@ else
 
 ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
-cat >>confdefs.h <<\_ACEOF
-#define C_ALLOCA 1
-_ACEOF
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
 
 
-{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }
-if test "${ac_cv_os_cray+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if test "${ac_cv_os_cray+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #if defined CRAY && ! defined CRAY2
 webecray
@@ -75436,102 +58559,22 @@ wenotbecray
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then
+  $EGREP "webecray" >/dev/null 2>&1; then :
   ac_cv_os_cray=yes
 else
   ac_cv_os_cray=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -75543,19 +58586,15 @@ fi
   done
 fi
 
-{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if test "${ac_cv_c_stack_direction+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_c_stack_direction=0
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -75578,43 +58617,18 @@ main ()
   return find_stack_direction () < 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_stack_direction=1
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_stack_direction=-1
+  ac_cv_c_stack_direction=-1
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
 cat >>confdefs.h <<_ACEOF
 #define STACK_DIRECTION $ac_cv_c_stack_direction
 _ACEOF
@@ -75622,19 +58636,15 @@ _ACEOF
 
 fi
 
-      { echo "$as_me:$LINENO: checking for working memcmp" >&5
-echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; }
-if test "${ac_cv_func_memcmp_working+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
+$as_echo_n "checking for working memcmp... " >&6; }
+if test "${ac_cv_func_memcmp_working+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_func_memcmp_working=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -75669,42 +58679,18 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_memcmp_working=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_memcmp_working=no
+  ac_cv_func_memcmp_working=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
-echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
+$as_echo "$ac_cv_func_memcmp_working" >&6; }
 test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
   *" memcmp.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
@@ -75712,151 +58698,21 @@ test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
 esac
 
 
-      if test "${ac_cv_header_stdarg_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for stdarg.h" >&5
-echo $ECHO_N "checking for stdarg.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdarg_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdarg_h" >&5
-echo "${ECHO_T}$ac_cv_header_stdarg_h" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking stdarg.h usability" >&5
-echo $ECHO_N "checking stdarg.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <stdarg.h>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking stdarg.h presence" >&5
-echo $ECHO_N "checking stdarg.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+      ac_fn_c_check_header_mongrel "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdarg_h" = x""yes; then :
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: stdarg.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: stdarg.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdarg.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: stdarg.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: stdarg.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: stdarg.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdarg.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: stdarg.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdarg.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: stdarg.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdarg.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: stdarg.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdarg.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: stdarg.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdarg.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: stdarg.h: in the future, the compiler will take precedence" >&2;}
 
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for stdarg.h" >&5
-echo $ECHO_N "checking for stdarg.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdarg_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_stdarg_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdarg_h" >&5
-echo "${ECHO_T}$ac_cv_header_stdarg_h" >&6; }
-
-fi
-if test $ac_cv_header_stdarg_h = yes; then
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STDARG_PROTOTYPES 1
-_ACEOF
+$as_echo "#define HAVE_STDARG_PROTOTYPES 1" >>confdefs.h
 
 
 fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define PHP_ONIG_BUNDLED 1
-_ACEOF
+$as_echo "#define PHP_ONIG_BUNDLED 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ONIG 1
-_ACEOF
+$as_echo "#define HAVE_ONIG 1" >>confdefs.h
 
 
   PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DNOT_RUBY"
@@ -75922,9 +58778,7 @@ _ACEOF
 
     else
                         if test ! -f "$PHP_ONIG/include/oniguruma.h"; then
-        { { echo "$as_me:$LINENO: error: oniguruma.h not found in $PHP_ONIG/include" >&5
-echo "$as_me: error: oniguruma.h not found in $PHP_ONIG/include" >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error "oniguruma.h not found in $PHP_ONIG/include" "$LINENO" 5
       fi
 
   if test "$PHP_ONIG/include" != "/usr/include"; then
@@ -75933,10 +58787,10 @@ echo "$as_me: error: oniguruma.h not found in $PHP_ONIG/include" >&2;}
     ai_p=$PHP_ONIG/include
   else
 
-    ep_dir="`echo $PHP_ONIG/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_ONIG/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ONIG/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_ONIG/include"`
   fi
 
 
@@ -76020,10 +58874,10 @@ echo "$as_me: error: oniguruma.h not found in $PHP_ONIG/include" >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -76055,18 +58909,14 @@ echo "$as_me: error: oniguruma.h not found in $PHP_ONIG/include" >&2;}
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for onig_init in -lonig" >&5
-echo $ECHO_N "checking for onig_init in -lonig... $ECHO_C" >&6; }
-if test "${ac_cv_lib_onig_onig_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for onig_init in -lonig" >&5
+$as_echo_n "checking for onig_init in -lonig... " >&6; }
+if test "${ac_cv_lib_onig_onig_init+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lonig  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -76084,39 +58934,18 @@ return onig_init ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_onig_onig_init=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_onig_onig_init=no
+  ac_cv_lib_onig_onig_init=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_onig_onig_init" >&5
-echo "${ECHO_T}$ac_cv_lib_onig_onig_init" >&6; }
-if test $ac_cv_lib_onig_onig_init = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_onig_onig_init" >&5
+$as_echo "$ac_cv_lib_onig_onig_init" >&6; }
+if test "x$ac_cv_lib_onig_onig_init" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -76133,10 +58962,10 @@ if test $ac_cv_lib_onig_onig_init = yes; then
     ai_p=$PHP_ONIG/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ONIG/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_ONIG/$PHP_LIBDIR"`
   fi
 
 
@@ -76176,10 +59005,10 @@ if test $ac_cv_lib_onig_onig_init = yes; then
     ai_p=$PHP_ONIG/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ONIG/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_ONIG/$PHP_LIBDIR"`
   fi
 
 
@@ -76219,9 +59048,7 @@ if test $ac_cv_lib_onig_onig_init = yes; then
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ONIG 1
-_ACEOF
+$as_echo "#define HAVE_ONIG 1" >>confdefs.h
 
 
 
@@ -76231,9 +59058,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_onig_onig_init
 
-        { { echo "$as_me:$LINENO: error: Problem with oniguruma. Please check config.log for more information." >&5
-echo "$as_me: error: Problem with oniguruma. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error "Problem with oniguruma. Please check config.log for more information." "$LINENO" 5
 
 
 fi
@@ -76294,10 +59119,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -76329,13 +59154,9 @@ fi
     esac
   done
 
-      { echo "$as_me:$LINENO: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
-echo $ECHO_N "checking if oniguruma has an invalid entry for KOI8 encoding... $ECHO_C" >&6; }
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
+$as_echo_n "checking if oniguruma has an invalid entry for KOI8 encoding... " >&6; }
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <oniguruma.h>
@@ -76350,45 +59171,22 @@ return (int)(ONIG_ENCODING_KOI8 + 1);
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
 
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define PHP_ONIG_BAD_KOI8_ENTRY 1
-_ACEOF
+$as_echo "#define PHP_ONIG_BAD_KOI8_ENTRY 1" >>confdefs.h
 
 
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
       LDFLAGS=$save_old_LDFLAGS
     fi
 
@@ -76400,9 +59198,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MBREGEX 1
-_ACEOF
+$as_echo "#define HAVE_MBREGEX 1" >>confdefs.h
 
 
 
@@ -76545,9 +59341,7 @@ _ACEOF
     done
 
     if test -z "$PHP_LIBMBFL_INCLUDE"; then
-      { { echo "$as_me:$LINENO: error: mbfilter.h not found. Please reinstall libmbfl library." >&5
-echo "$as_me: error: mbfilter.h not found. Please reinstall libmbfl library." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "mbfilter.h not found. Please reinstall libmbfl library." "$LINENO" 5
     else
 
   if test "$PHP_LIBMBFL_INCLUDE" != "/usr/include"; then
@@ -76556,10 +59350,10 @@ echo "$as_me: error: mbfilter.h not found. Please reinstall libmbfl library." >&
     ai_p=$PHP_LIBMBFL_INCLUDE
   else
 
-    ep_dir="`echo $PHP_LIBMBFL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_LIBMBFL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_LIBMBFL_INCLUDE\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_LIBMBFL_INCLUDE"`
   fi
 
 
@@ -76644,10 +59438,10 @@ echo "$as_me: error: mbfilter.h not found. Please reinstall libmbfl library." >&
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -76679,18 +59473,14 @@ echo "$as_me: error: mbfilter.h not found. Please reinstall libmbfl library." >&
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for mbfl_buffer_converter_new in -lmbfl" >&5
-echo $ECHO_N "checking for mbfl_buffer_converter_new in -lmbfl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_mbfl_mbfl_buffer_converter_new+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbfl_buffer_converter_new in -lmbfl" >&5
+$as_echo_n "checking for mbfl_buffer_converter_new in -lmbfl... " >&6; }
+if test "${ac_cv_lib_mbfl_mbfl_buffer_converter_new+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmbfl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -76708,39 +59498,18 @@ return mbfl_buffer_converter_new ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_mbfl_mbfl_buffer_converter_new=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_mbfl_mbfl_buffer_converter_new=no
+  ac_cv_lib_mbfl_mbfl_buffer_converter_new=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_mbfl_mbfl_buffer_converter_new" >&5
-echo "${ECHO_T}$ac_cv_lib_mbfl_mbfl_buffer_converter_new" >&6; }
-if test $ac_cv_lib_mbfl_mbfl_buffer_converter_new = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mbfl_mbfl_buffer_converter_new" >&5
+$as_echo "$ac_cv_lib_mbfl_mbfl_buffer_converter_new" >&6; }
+if test "x$ac_cv_lib_mbfl_mbfl_buffer_converter_new" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -76757,10 +59526,10 @@ if test $ac_cv_lib_mbfl_mbfl_buffer_converter_new = yes; then
     ai_p=$PHP_LIBMBFL/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $PHP_LIBMBFL/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_LIBMBFL/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_LIBMBFL/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_LIBMBFL/$PHP_LIBDIR"`
   fi
 
 
@@ -76800,10 +59569,10 @@ if test $ac_cv_lib_mbfl_mbfl_buffer_converter_new = yes; then
     ai_p=$PHP_LIBMBFL/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $PHP_LIBMBFL/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_LIBMBFL/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_LIBMBFL/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_LIBMBFL/$PHP_LIBDIR"`
   fi
 
 
@@ -76850,9 +59619,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_mbfl_mbfl_buffer_converter_new
 
-      { { echo "$as_me:$LINENO: error: Problem with libmbfl. Please check config.log for more information." >&5
-echo "$as_me: error: Problem with libmbfl. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Problem with libmbfl. Please check config.log for more information." "$LINENO" 5
 
 
 fi
@@ -77173,10 +59940,10 @@ EOF
     ai_p=$ext_srcdir/$dir
   else
 
-    ep_dir="`echo $ext_srcdir/$dir|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ext_srcdir/$dir|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ext_srcdir/$dir\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ext_srcdir/$dir"`
   fi
 
 
@@ -77204,10 +59971,10 @@ EOF
     ai_p=$ext_builddir/$dir
   else
 
-    ep_dir="`echo $ext_builddir/$dir|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ext_builddir/$dir|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ext_builddir/$dir\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ext_builddir/$dir"`
   fi
 
 
@@ -77364,11 +60131,11 @@ fi
 
 php_with_mcrypt=no
 
-{ echo "$as_me:$LINENO: checking for mcrypt support" >&5
-echo $ECHO_N "checking for mcrypt support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mcrypt support" >&5
+$as_echo_n "checking for mcrypt support... " >&6; }
 
 # Check whether --with-mcrypt was given.
-if test "${with_mcrypt+set}" = set; then
+if test "${with_mcrypt+set}" = set; then :
   withval=$with_mcrypt; PHP_MCRYPT=$withval
 else
 
@@ -77400,8 +60167,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -77412,21 +60179,15 @@ if test "$PHP_MCRYPT" != "no"; then
   done
 
   if test -z "$MCRYPT_DIR"; then
-    { { echo "$as_me:$LINENO: error: mcrypt.h not found. Please reinstall libmcrypt." >&5
-echo "$as_me: error: mcrypt.h not found. Please reinstall libmcrypt." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "mcrypt.h not found. Please reinstall libmcrypt." "$LINENO" 5
   fi
 
 
   old_CPPFLAGS=$CPPFLAGS
   CPPFLAGS=-I$MCRYPT_DIR/include
-  { echo "$as_me:$LINENO: checking for libmcrypt version" >&5
-echo $ECHO_N "checking for libmcrypt version... $ECHO_C" >&6; }
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmcrypt version" >&5
+$as_echo_n "checking for libmcrypt version... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <mcrypt.h>
@@ -77436,19 +60197,17 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1; then
+  $EGREP "yes" >/dev/null 2>&1; then :
 
-    { echo "$as_me:$LINENO: result: >= 2.5.6" >&5
-echo "${ECHO_T}>= 2.5.6" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: >= 2.5.6" >&5
+$as_echo ">= 2.5.6" >&6; }
 
 else
 
-    { { echo "$as_me:$LINENO: error: libmcrypt version 2.5.6 or greater required." >&5
-echo "$as_me: error: libmcrypt version 2.5.6 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "libmcrypt version 2.5.6 or greater required." "$LINENO" 5
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
   CPPFLAGS=$old_CPPFLAGS
 
@@ -77515,10 +60274,10 @@ rm -f -r conftest*
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -77550,18 +60309,14 @@ rm -f -r conftest*
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for mcrypt_module_open in -lmcrypt" >&5
-echo $ECHO_N "checking for mcrypt_module_open in -lmcrypt... $ECHO_C" >&6; }
-if test "${ac_cv_lib_mcrypt_mcrypt_module_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mcrypt_module_open in -lmcrypt" >&5
+$as_echo_n "checking for mcrypt_module_open in -lmcrypt... " >&6; }
+if test "${ac_cv_lib_mcrypt_mcrypt_module_open+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmcrypt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -77579,39 +60334,18 @@ return mcrypt_module_open ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_mcrypt_mcrypt_module_open=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_mcrypt_mcrypt_module_open=no
+  ac_cv_lib_mcrypt_mcrypt_module_open=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_mcrypt_mcrypt_module_open" >&5
-echo "${ECHO_T}$ac_cv_lib_mcrypt_mcrypt_module_open" >&6; }
-if test $ac_cv_lib_mcrypt_mcrypt_module_open = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mcrypt_mcrypt_module_open" >&5
+$as_echo "$ac_cv_lib_mcrypt_mcrypt_module_open" >&6; }
+if test "x$ac_cv_lib_mcrypt_mcrypt_module_open" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -77640,9 +60374,7 @@ if test $ac_cv_lib_mcrypt_mcrypt_module_open = yes; then
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBMCRYPT 1
-_ACEOF
+$as_echo "#define HAVE_LIBMCRYPT 1" >>confdefs.h
 
 
 
@@ -77714,10 +60446,10 @@ else
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -77749,18 +60481,14 @@ else
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for mcrypt_module_open in -lmcrypt" >&5
-echo $ECHO_N "checking for mcrypt_module_open in -lmcrypt... $ECHO_C" >&6; }
-if test "${ac_cv_lib_mcrypt_mcrypt_module_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mcrypt_module_open in -lmcrypt" >&5
+$as_echo_n "checking for mcrypt_module_open in -lmcrypt... " >&6; }
+if test "${ac_cv_lib_mcrypt_mcrypt_module_open+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmcrypt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -77778,47 +60506,24 @@ return mcrypt_module_open ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_mcrypt_mcrypt_module_open=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_mcrypt_mcrypt_module_open=no
+  ac_cv_lib_mcrypt_mcrypt_module_open=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_mcrypt_mcrypt_module_open" >&5
-echo "${ECHO_T}$ac_cv_lib_mcrypt_mcrypt_module_open" >&6; }
-if test $ac_cv_lib_mcrypt_mcrypt_module_open = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mcrypt_mcrypt_module_open" >&5
+$as_echo "$ac_cv_lib_mcrypt_mcrypt_module_open" >&6; }
+if test "x$ac_cv_lib_mcrypt_mcrypt_module_open" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBMCRYPT 1
-_ACEOF
+$as_echo "#define HAVE_LIBMCRYPT 1" >>confdefs.h
 
 
 
@@ -77828,9 +60533,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_mcrypt_mcrypt_module_open
 
-      { { echo "$as_me:$LINENO: error: Sorry, I was not able to diagnose which libmcrypt version you have installed." >&5
-echo "$as_me: error: Sorry, I was not able to diagnose which libmcrypt version you have installed." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Sorry, I was not able to diagnose which libmcrypt version you have installed." "$LINENO" 5
 
 
 fi
@@ -77852,10 +60555,10 @@ fi
     ai_p=$MCRYPT_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $MCRYPT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $MCRYPT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$MCRYPT_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -77895,10 +60598,10 @@ fi
     ai_p=$MCRYPT_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $MCRYPT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $MCRYPT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$MCRYPT_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -77944,10 +60647,10 @@ fi
     ai_p=$MCRYPT_DIR/include
   else
 
-    ep_dir="`echo $MCRYPT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $MCRYPT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$MCRYPT_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$MCRYPT_DIR/include"`
   fi
 
 
@@ -78271,11 +60974,11 @@ fi
 
 php_with_mssql=no
 
-{ echo "$as_me:$LINENO: checking for MSSQL support via FreeTDS" >&5
-echo $ECHO_N "checking for MSSQL support via FreeTDS... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MSSQL support via FreeTDS" >&5
+$as_echo_n "checking for MSSQL support via FreeTDS... " >&6; }
 
 # Check whether --with-mssql was given.
-if test "${with_mssql+set}" = set; then
+if test "${with_mssql+set}" = set; then :
   withval=$with_mssql; PHP_MSSQL=$withval
 else
 
@@ -78307,8 +61010,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -78329,9 +61032,7 @@ if test "$PHP_MSSQL" != "no"; then
     done
 
     if test -z "$FREETDS_INSTALLATION_DIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find FreeTDS in known installation directories" >&5
-echo "$as_me: error: Cannot find FreeTDS in known installation directories" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Cannot find FreeTDS in known installation directories" "$LINENO" 5
     fi
 
   elif test "$PHP_MSSQL" != "no"; then
@@ -78343,16 +61044,12 @@ echo "$as_me: error: Cannot find FreeTDS in known installation directories" >&2;
       FREETDS_INSTALLATION_DIR=$PHP_MSSQL
       FREETDS_INCLUDE_DIR=$PHP_MSSQL/include/freetds
     else
-      { { echo "$as_me:$LINENO: error: Directory $PHP_MSSQL is not a FreeTDS installation directory" >&5
-echo "$as_me: error: Directory $PHP_MSSQL is not a FreeTDS installation directory" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Directory $PHP_MSSQL is not a FreeTDS installation directory" "$LINENO" 5
     fi
   fi
 
   if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
-     { { echo "$as_me:$LINENO: error: Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" >&5
-echo "$as_me: error: Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" >&2;}
-   { (exit 1); exit 1; }; }
+     as_fn_error "Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" "$LINENO" 5
   fi
 
 
@@ -78362,10 +61059,10 @@ echo "$as_me: error: Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsyb
     ai_p=$FREETDS_INCLUDE_DIR
   else
 
-    ep_dir="`echo $FREETDS_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $FREETDS_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$FREETDS_INCLUDE_DIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$FREETDS_INCLUDE_DIR"`
   fi
 
 
@@ -78398,10 +61095,10 @@ echo "$as_me: error: Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsyb
     ai_p=$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -78441,10 +61138,10 @@ echo "$as_me: error: Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsyb
     ai_p=$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -78777,18 +61474,14 @@ EOF
 
   fi
 
-  { echo "$as_me:$LINENO: checking for dnet_addr in -ldnet_stub" >&5
-echo $ECHO_N "checking for dnet_addr in -ldnet_stub... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dnet_stub_dnet_addr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_addr in -ldnet_stub" >&5
+$as_echo_n "checking for dnet_addr in -ldnet_stub... " >&6; }
+if test "${ac_cv_lib_dnet_stub_dnet_addr+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -78806,39 +61499,18 @@ return dnet_addr ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dnet_stub_dnet_addr=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dnet_stub_dnet_addr=no
+  ac_cv_lib_dnet_stub_dnet_addr=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_addr" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_addr" >&6; }
-if test $ac_cv_lib_dnet_stub_dnet_addr = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_addr" >&5
+$as_echo "$ac_cv_lib_dnet_stub_dnet_addr" >&6; }
+if test "x$ac_cv_lib_dnet_stub_dnet_addr" = x""yes; then :
 
 
   if test "$ext_shared" = "yes"; then
@@ -78851,10 +61523,10 @@ if test $ac_cv_lib_dnet_stub_dnet_addr = yes; then
     ai_p=
   else
 
-    ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo |$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename ""`
   fi
 
 
@@ -78894,10 +61566,10 @@ if test $ac_cv_lib_dnet_stub_dnet_addr = yes; then
     ai_p=
   else
 
-    ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo |$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename ""`
   fi
 
 
@@ -78937,22 +61609,16 @@ if test $ac_cv_lib_dnet_stub_dnet_addr = yes; then
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBDNET_STUB 1
-_ACEOF
+$as_echo "#define HAVE_LIBDNET_STUB 1" >>confdefs.h
 
 
 fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MSSQL 1
-_ACEOF
+$as_echo "#define HAVE_MSSQL 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FREETDS 1
-_ACEOF
+$as_echo "#define HAVE_FREETDS 1" >>confdefs.h
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST MSSQL_SHARED_LIBADD"
@@ -78968,11 +61634,11 @@ fi
 
 php_with_mysql=no
 
-{ echo "$as_me:$LINENO: checking for MySQL support" >&5
-echo $ECHO_N "checking for MySQL support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL support" >&5
+$as_echo_n "checking for MySQL support... " >&6; }
 
 # Check whether --with-mysql was given.
-if test "${with_mysql+set}" = set; then
+if test "${with_mysql+set}" = set; then :
   withval=$with_mysql; PHP_MYSQL=$withval
 else
 
@@ -79004,8 +61670,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -79013,11 +61679,11 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_with_mysql_sock=no
 
-{ echo "$as_me:$LINENO: checking for specified location of the MySQL UNIX socket" >&5
-echo $ECHO_N "checking for specified location of the MySQL UNIX socket... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for specified location of the MySQL UNIX socket" >&5
+$as_echo_n "checking for specified location of the MySQL UNIX socket... " >&6; }
 
 # Check whether --with-mysql-sock was given.
-if test "${with_mysql_sock+set}" = set; then
+if test "${with_mysql_sock+set}" = set; then :
   withval=$with_mysql_sock; PHP_MYSQL_SOCK=$withval
 else
 
@@ -79028,8 +61694,8 @@ fi
 
 
 ext_output=$PHP_MYSQL_SOCK
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -79038,11 +61704,11 @@ if test -z "$PHP_ZLIB_DIR"; then
 
 php_with_zlib_dir=no
 
-{ echo "$as_me:$LINENO: checking for the location of libz" >&5
-echo $ECHO_N "checking for the location of libz... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libz" >&5
+$as_echo_n "checking for the location of libz... " >&6; }
 
 # Check whether --with-zlib-dir was given.
-if test "${with_zlib_dir+set}" = set; then
+if test "${with_zlib_dir+set}" = set; then :
   withval=$with_zlib_dir; PHP_ZLIB_DIR=$withval
 else
 
@@ -79053,8 +61719,8 @@ fi
 
 
 ext_output=$PHP_ZLIB_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -79078,11 +61744,8 @@ elif test "$PHP_MYSQL" != "no"; then
   fi
 
   if test -z "$MYSQL_DIR"; then
-    { { echo "$as_me:$LINENO: error: Cannot find MySQL header files under $PHP_MYSQL.
-Note that the MySQL client library is not bundled anymore!" >&5
-echo "$as_me: error: Cannot find MySQL header files under $PHP_MYSQL.
-Note that the MySQL client library is not bundled anymore!" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Cannot find MySQL header files under $PHP_MYSQL.
+Note that the MySQL client library is not bundled anymore!" "$LINENO" 5
   fi
 
   if test "$enable_maintainer_zts" = "yes"; then
@@ -79136,11 +61799,8 @@ Note that the MySQL client library is not bundled anymore!" >&2;}
   fi
 
   if test -z "$MYSQL_LIB_DIR"; then
-    { { echo "$as_me:$LINENO: error: Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR.
-Note that the MySQL client library is not bundled anymore!" >&5
-echo "$as_me: error: Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR.
-Note that the MySQL client library is not bundled anymore!" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR.
+Note that the MySQL client library is not bundled anymore!" "$LINENO" 5
   fi
 
 
@@ -79205,10 +61865,10 @@ Note that the MySQL client library is not bundled anymore!" >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -79240,19 +61900,15 @@ Note that the MySQL client library is not bundled anymore!" >&2;}
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$MYSQL_LIBNAME''_mysql_close" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for mysql_close in -l$MYSQL_LIBNAME" >&5
-echo $ECHO_N "checking for mysql_close in -l$MYSQL_LIBNAME... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$MYSQL_LIBNAME''_mysql_close" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_close in -l$MYSQL_LIBNAME" >&5
+$as_echo_n "checking for mysql_close in -l$MYSQL_LIBNAME... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$MYSQL_LIBNAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -79270,40 +61926,20 @@ return mysql_close ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -79328,10 +61964,10 @@ else
     ai_p=$PHP_ZLIB_DIR
   else
 
-    ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_ZLIB_DIR"`
   fi
 
 
@@ -79371,10 +62007,10 @@ else
     ai_p=$PHP_ZLIB_DIR
   else
 
-    ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_ZLIB_DIR"`
   fi
 
 
@@ -79475,10 +62111,10 @@ else
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -79510,19 +62146,15 @@ else
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$MYSQL_LIBNAME''_mysql_error" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for mysql_error in -l$MYSQL_LIBNAME" >&5
-echo $ECHO_N "checking for mysql_error in -l$MYSQL_LIBNAME... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$MYSQL_LIBNAME''_mysql_error" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_error in -l$MYSQL_LIBNAME" >&5
+$as_echo_n "checking for mysql_error in -l$MYSQL_LIBNAME... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$MYSQL_LIBNAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -79540,40 +62172,20 @@ return mysql_error ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -79585,9 +62197,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$MYSQL_LIBNAME_mysql_error
 
-        { { echo "$as_me:$LINENO: error: mysql configure failed. Please check config.log for more information." >&5
-echo "$as_me: error: mysql configure failed. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error "mysql configure failed. Please check config.log for more information." "$LINENO" 5
 
 
 fi
@@ -79679,10 +62289,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -79714,19 +62324,15 @@ fi
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$MYSQL_LIBNAME''_mysql_errno" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5
-echo $ECHO_N "checking for mysql_errno in -l$MYSQL_LIBNAME... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$MYSQL_LIBNAME''_mysql_errno" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5
+$as_echo_n "checking for mysql_errno in -l$MYSQL_LIBNAME... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$MYSQL_LIBNAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -79744,40 +62350,20 @@ return mysql_errno ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -79789,9 +62375,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$MYSQL_LIBNAME_mysql_errno
 
-        { { echo "$as_me:$LINENO: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." >&5
-echo "$as_me: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error "Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." "$LINENO" 5
 
 
 fi
@@ -79815,10 +62399,10 @@ fi
     ai_p=$MYSQL_LIB_DIR
   else
 
-    ep_dir="`echo $MYSQL_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $MYSQL_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$MYSQL_LIB_DIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$MYSQL_LIB_DIR"`
   fi
 
 
@@ -79858,10 +62442,10 @@ fi
     ai_p=$MYSQL_LIB_DIR
   else
 
-    ep_dir="`echo $MYSQL_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $MYSQL_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$MYSQL_LIB_DIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$MYSQL_LIB_DIR"`
   fi
 
 
@@ -79907,10 +62491,10 @@ fi
     ai_p=$MYSQL_INC_DIR
   else
 
-    ep_dir="`echo $MYSQL_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $MYSQL_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$MYSQL_INC_DIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$MYSQL_INC_DIR"`
   fi
 
 
@@ -79957,8 +62541,8 @@ fi
 fi
 
 if test "$PHP_MYSQL" != "no"; then
-  { echo "$as_me:$LINENO: checking for MySQL UNIX socket location" >&5
-echo $ECHO_N "checking for MySQL UNIX socket location... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL UNIX socket location" >&5
+$as_echo_n "checking for MySQL UNIX socket location... " >&6; }
   if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
     MYSQL_SOCK=$PHP_MYSQL_SOCK
 
@@ -79966,8 +62550,8 @@ cat >>confdefs.h <<_ACEOF
 #define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
 _ACEOF
 
-    { echo "$as_me:$LINENO: result: $MYSQL_SOCK" >&5
-echo "${ECHO_T}$MYSQL_SOCK" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
+$as_echo "$MYSQL_SOCK" >&6; }
   elif test "$PHP_MYSQL" = "yes" || test "$PHP_MYSQL_SOCK" = "yes"; then
 
   for i in  \
@@ -79993,22 +62577,20 @@ cat >>confdefs.h <<_ACEOF
 #define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
 _ACEOF
 
-    { echo "$as_me:$LINENO: result: $MYSQL_SOCK" >&5
-echo "${ECHO_T}$MYSQL_SOCK" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
+$as_echo "$MYSQL_SOCK" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MYSQL 1
-_ACEOF
+$as_echo "#define HAVE_MYSQL 1" >>confdefs.h
 
 
   ext_builddir=ext/mysql
@@ -80313,36 +62895,22 @@ EOF
   is_it_shared=$PHP_MYSQLND_SHARED
   is_it_enabled=$PHP_MYSQLND
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension mysql to build statically, but it
-depends on extension mysqlnd, which you've configured to build shared.
-You either need to build mysql shared or build mysqlnd statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension mysql to build statically, but it
 depends on extension mysqlnd, which you've configured to build shared.
 You either need to build mysql shared or build mysqlnd statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension mysql, which depends on extension mysqlnd,
-but you've either not enabled mysqlnd, or have disabled it.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension mysql, which depends on extension mysqlnd,
 but you've either not enabled mysqlnd, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define MYSQL_USE_MYSQLND 1
-_ACEOF
+$as_echo "#define MYSQL_USE_MYSQLND 1" >>confdefs.h
 
   fi
 fi
@@ -80351,11 +62919,11 @@ fi
 
 php_with_mysqli=no
 
-{ echo "$as_me:$LINENO: checking for MySQLi support" >&5
-echo $ECHO_N "checking for MySQLi support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQLi support" >&5
+$as_echo_n "checking for MySQLi support... " >&6; }
 
 # Check whether --with-mysqli was given.
-if test "${with_mysqli+set}" = set; then
+if test "${with_mysqli+set}" = set; then :
   withval=$with_mysqli; PHP_MYSQLI=$withval
 else
 
@@ -80387,8 +62955,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -80396,10 +62964,10 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_enable_embedded_mysqli=no
 
-{ echo "$as_me:$LINENO: checking whether to enable embedded MySQLi support" >&5
-echo $ECHO_N "checking whether to enable embedded MySQLi support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable embedded MySQLi support" >&5
+$as_echo_n "checking whether to enable embedded MySQLi support... " >&6; }
 # Check whether --enable-embedded_mysqli was given.
-if test "${enable_embedded_mysqli+set}" = set; then
+if test "${enable_embedded_mysqli+set}" = set; then :
   enableval=$enable_embedded_mysqli; PHP_EMBEDDED_MYSQLI=$enableval
 else
 
@@ -80410,8 +62978,8 @@ fi
 
 
 ext_output=$PHP_EMBEDDED_MYSQLI
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -80426,9 +62994,7 @@ elif test "$PHP_MYSQLI" != "no"; then
   MYSQL_LIB_NAME='mysqlclient'
   if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_EMBEDDED_MYSQLI 1
-_ACEOF
+$as_echo "#define HAVE_EMBEDDED_MYSQLI 1" >>confdefs.h
 
     MYSQL_LIB_CFG='--libmysqld-libs'
         mysqli_extra_sources="mysqli_embedded.c"
@@ -80443,11 +63009,9 @@ _ACEOF
     MYSQLI_INCLINE=`$MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
     MYSQLI_LIBLINE=`$MYSQL_CONFIG $MYSQL_LIB_CFG | $SED -e "s/'//g"`
   else
-    { echo "$as_me:$LINENO: result: mysql_config not found" >&5
-echo "${ECHO_T}mysql_config not found" >&6; }
-    { { echo "$as_me:$LINENO: error: Please reinstall the mysql distribution" >&5
-echo "$as_me: error: Please reinstall the mysql distribution" >&2;}
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: mysql_config not found" >&5
+$as_echo "mysql_config not found" >&6; }
+    as_fn_error "Please reinstall the mysql distribution" "$LINENO" 5
   fi
 
 
@@ -80512,10 +63076,10 @@ echo "$as_me: error: Please reinstall the mysql distribution" >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -80547,19 +63111,15 @@ echo "$as_me: error: Please reinstall the mysql distribution" >&2;}
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$MYSQL_LIB_NAME''_mysql_set_server_option" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5
-echo $ECHO_N "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$MYSQL_LIB_NAME''_mysql_set_server_option" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5
+$as_echo_n "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$MYSQL_LIB_NAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -80577,40 +63137,20 @@ return mysql_set_server_option ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -80627,10 +63167,10 @@ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -80709,10 +63249,10 @@ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -80745,9 +63285,7 @@ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   done
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MYSQLILIB 1
-_ACEOF
+$as_echo "#define HAVE_MYSQLILIB 1" >>confdefs.h
 
 
   save_old_LDFLAGS=$LDFLAGS
@@ -80809,10 +63347,10 @@ _ACEOF
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -80844,19 +63382,15 @@ _ACEOF
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$MYSQL_LIB_NAME''_mysql_set_character_set" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5
-echo $ECHO_N "checking for mysql_set_character_set in -l$MYSQL_LIB_NAME... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$MYSQL_LIB_NAME''_mysql_set_character_set" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5
+$as_echo_n "checking for mysql_set_character_set in -l$MYSQL_LIB_NAME... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$MYSQL_LIB_NAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -80874,40 +63408,20 @@ return mysql_set_character_set ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -80919,9 +63433,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$MYSQL_LIB_NAME_mysql_set_character_set
 
-      { { echo "$as_me:$LINENO: error: MySQLI doesn't support versions < 4.1.13 (for MySQL 4.1.x) and < 5.0.7 for (MySQL 5.0.x) anymore. Please update your libraries." >&5
-echo "$as_me: error: MySQLI doesn't support versions < 4.1.13 (for MySQL 4.1.x) and < 5.0.7 for (MySQL 5.0.x) anymore. Please update your libraries." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "MySQLI doesn't support versions < 4.1.13 (for MySQL 4.1.x) and < 5.0.7 for (MySQL 5.0.x) anymore. Please update your libraries." "$LINENO" 5
 
 
 fi
@@ -80934,9 +63446,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$MYSQL_LIB_NAME_mysql_set_server_option
 
-    { { echo "$as_me:$LINENO: error: wrong mysql library version or lib not found. Check config.log for more information." >&5
-echo "$as_me: error: wrong mysql library version or lib not found. Check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "wrong mysql library version or lib not found. Check config.log for more information." "$LINENO" 5
 
 
 fi
@@ -81003,10 +63513,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -81038,19 +63548,15 @@ fi
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$MYSQL_LIB_NAME''_mysql_stmt_next_result" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5
-echo $ECHO_N "checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$MYSQL_LIB_NAME''_mysql_stmt_next_result" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5
+$as_echo_n "checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$MYSQL_LIB_NAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -81068,48 +63574,26 @@ return mysql_stmt_next_result ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STMT_NEXT_RESULT 1
-_ACEOF
+$as_echo "#define HAVE_STMT_NEXT_RESULT 1" >>confdefs.h
 
 
 
@@ -81450,36 +63934,22 @@ EOF
   is_it_shared=$PHP_MYSQLND_SHARED
   is_it_enabled=$PHP_MYSQLND
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension mysqli to build statically, but it
 depends on extension mysqlnd, which you've configured to build shared.
 You either need to build mysqli shared or build mysqlnd statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension mysqli to build statically, but it
-depends on extension mysqlnd, which you've configured to build shared.
-You either need to build mysqli shared or build mysqlnd statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension mysqli, which depends on extension mysqlnd,
-but you've either not enabled mysqlnd, or have disabled it.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension mysqli, which depends on extension mysqlnd,
 but you've either not enabled mysqlnd, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define MYSQLI_USE_MYSQLND 1
-_ACEOF
+$as_echo "#define MYSQLI_USE_MYSQLND 1" >>confdefs.h
 
 
 
@@ -81547,11 +64017,11 @@ fi
 
 php_with_oci8=no
 
-{ echo "$as_me:$LINENO: checking for Oracle Database OCI8 support" >&5
-echo $ECHO_N "checking for Oracle Database OCI8 support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Oracle Database OCI8 support" >&5
+$as_echo_n "checking for Oracle Database OCI8 support... " >&6; }
 
 # Check whether --with-oci8 was given.
-if test "${with_oci8+set}" = set; then
+if test "${with_oci8+set}" = set; then :
   withval=$with_oci8; PHP_OCI8=$withval
 else
 
@@ -81583,8 +64053,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -81592,21 +64062,17 @@ echo "${ECHO_T}$ext_output" >&6; }
 if test "$PHP_OCI8" != "no"; then
 
   if test -z "$PHP_OCI8"; then
-        { { echo "$as_me:$LINENO: error: Empty parameter value passed to --with-oci8" >&5
-echo "$as_me: error: Empty parameter value passed to --with-oci8" >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error "Empty parameter value passed to --with-oci8" "$LINENO" 5
   fi
 
 
-  { echo "$as_me:$LINENO: checking PHP version" >&5
-echo $ECHO_N "checking PHP version... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking PHP version" >&5
+$as_echo_n "checking PHP version... " >&6; }
 
   tmp_version=$PHP_VERSION
   if test -z "$tmp_version"; then
     if test -z "$PHP_CONFIG"; then
-      { { echo "$as_me:$LINENO: error: php-config not found" >&5
-echo "$as_me: error: php-config not found" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "php-config not found" "$LINENO" 5
     fi
     php_version=`$PHP_CONFIG --version 2>/dev/null|head -n 1|$PHP_OCI8_SED -e 's#\([0-9]\.[0-9]*\.[0-9]*\)\(.*\)#\1#'`
   else
@@ -81614,9 +64080,7 @@ echo "$as_me: error: php-config not found" >&2;}
   fi
 
   if test -z "$php_version"; then
-    { { echo "$as_me:$LINENO: error: failed to detect PHP version, please report" >&5
-echo "$as_me: error: failed to detect PHP version, please report" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "failed to detect PHP version, please report" "$LINENO" 5
   fi
 
   ac_IFS=$IFS
@@ -81626,416 +64090,41 @@ echo "$as_me: error: failed to detect PHP version, please report" >&2;}
   oci8_php_version=`expr $1 \* 1000000 + $2 \* 1000 + $3`
 
   if test "$oci8_php_version" -lt "4003009"; then
-    { { echo "$as_me:$LINENO: error: You need at least PHP 4.3.9 to be able to use this version of OCI8. PHP $php_version found" >&5
-echo "$as_me: error: You need at least PHP 4.3.9 to be able to use this version of OCI8. PHP $php_version found" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "You need at least PHP 4.3.9 to be able to use this version of OCI8. PHP $php_version found" "$LINENO" 5
   elif test "$oci8_php_version" -ge "6000000"; then
-    { { echo "$as_me:$LINENO: error: This version of OCI8 is not compatible with PHP 6 or higher" >&5
-echo "$as_me: error: This version of OCI8 is not compatible with PHP 6 or higher" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "This version of OCI8 is not compatible with PHP 6 or higher" "$LINENO" 5
   else
-    { echo "$as_me:$LINENO: result: $php_version, ok" >&5
-echo "${ECHO_T}$php_version, ok" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_version, ok" >&5
+$as_echo "$php_version, ok" >&6; }
   fi
 
 
-  { echo "$as_me:$LINENO: checking for long int" >&5
-echo $ECHO_N "checking for long int... $ECHO_C" >&6; }
-if test "${ac_cv_type_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long int ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_long_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_int" >&5
-echo "${ECHO_T}$ac_cv_type_long_int" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
+  # 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.
-{ echo "$as_me:$LINENO: checking size of long int" >&5
-echo $ECHO_N "checking size of long int... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long int" >&5
+$as_echo_n "checking size of long int... " >&6; }
+if test "${ac_cv_sizeof_long_int+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long int))" "ac_cv_sizeof_long_int"        "$ac_includes_default"; then :
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_int=$ac_lo;;
-'') if test "$ac_cv_type_long_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_int=0
-   fi ;;
-esac
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_long_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_long_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long int)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_long_int=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_int" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_int" >&5
+$as_echo "$ac_cv_sizeof_long_int" >&6; }
 
 
 
@@ -82044,16 +64133,16 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-  { echo "$as_me:$LINENO: checking checking if we're on a 64-bit platform" >&5
-echo $ECHO_N "checking checking if we're on a 64-bit platform... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking checking if we're on a 64-bit platform" >&5
+$as_echo_n "checking checking if we're on a 64-bit platform... " >&6; }
   if test "$ac_cv_sizeof_long_int" = "4"; then
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     PHP_OCI8_OH_LIBDIR=lib32
     PHP_OCI8_IC_LIBDIR_SUFFIX=""
   else
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     PHP_OCI8_OH_LIBDIR=lib
     PHP_OCI8_IC_LIBDIR_SUFFIX=64
   fi
@@ -82062,8 +64151,8 @@ echo "${ECHO_T}yes" >&6; }
   PHP_OCI8_INSTANT_CLIENT="no"
 
             if test "$PHP_OCI8" = "yes" && test -z "$ORACLE_HOME"; then
-    { echo "$as_me:$LINENO: WARNING: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" >&5
-echo "$as_me: WARNING: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" >&5
+$as_echo "$as_me: WARNING: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" >&2;}
     PHP_OCI8=instantclient
   fi
 
@@ -82091,24 +64180,22 @@ echo "$as_me: WARNING: OCI8 extension: ORACLE_HOME is not set, looking for defau
 
   if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
 
-    { echo "$as_me:$LINENO: checking Oracle ORACLE_HOME install directory" >&5
-echo $ECHO_N "checking Oracle ORACLE_HOME install directory... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle ORACLE_HOME install directory" >&5
+$as_echo_n "checking Oracle ORACLE_HOME install directory... " >&6; }
 
     if test "$PHP_OCI8" = "yes"; then
       OCI8_DIR=$ORACLE_HOME
     else
       OCI8_DIR=$PHP_OCI8
     fi
-    { echo "$as_me:$LINENO: result: $OCI8_DIR" >&5
-echo "${ECHO_T}$OCI8_DIR" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCI8_DIR" >&5
+$as_echo "$OCI8_DIR" >&6; }
 
 
-  { echo "$as_me:$LINENO: checking ORACLE_HOME library validity" >&5
-echo $ECHO_N "checking ORACLE_HOME library validity... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking ORACLE_HOME library validity" >&5
+$as_echo_n "checking ORACLE_HOME library validity... " >&6; }
   if test ! -d "$OCI8_DIR"; then
-    { { echo "$as_me:$LINENO: error: ${OCI8_DIR} is not a directory" >&5
-echo "$as_me: error: ${OCI8_DIR} is not a directory" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "${OCI8_DIR} is not a directory" "$LINENO" 5
   fi
   if test -d "$OCI8_DIR/lib" && test ! -d "$OCI8_DIR/lib32"; then
     OCI8_LIB_DIR=lib
@@ -82118,17 +64205,13 @@ echo "$as_me: error: ${OCI8_DIR} is not a directory" >&2;}
     OCI8_LIB_DIR=$PHP_OCI8_OH_LIBDIR
   else
         if test -f "$OCI8_DIR/libociei.$SHLIB_SUFFIX_NAME"; then
-      { { echo "$as_me:$LINENO: error: Expected an ORACLE_HOME top level directory but ${OCI8_DIR} appears to be an Instant Client directory. Try --with-oci8=instantclient,${OCI8_DIR}" >&5
-echo "$as_me: error: Expected an ORACLE_HOME top level directory but ${OCI8_DIR} appears to be an Instant Client directory. Try --with-oci8=instantclient,${OCI8_DIR}" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Expected an ORACLE_HOME top level directory but ${OCI8_DIR} appears to be an Instant Client directory. Try --with-oci8=instantclient,${OCI8_DIR}" "$LINENO" 5
     else
-      { { echo "$as_me:$LINENO: error: Oracle library directory not found in ${OCI8_DIR}" >&5
-echo "$as_me: error: Oracle library directory not found in ${OCI8_DIR}" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Oracle library directory not found in ${OCI8_DIR}" "$LINENO" 5
     fi
   fi
-  { echo "$as_me:$LINENO: result: $OCI8_LIB_DIR" >&5
-echo "${ECHO_T}$OCI8_LIB_DIR" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCI8_LIB_DIR" >&5
+$as_echo "$OCI8_LIB_DIR" >&6; }
 
 
     if test -d "$OCI8_DIR/rdbms/public"; then
@@ -82139,10 +64222,10 @@ echo "${ECHO_T}$OCI8_LIB_DIR" >&6; }
     ai_p=$OCI8_DIR/rdbms/public
   else
 
-    ep_dir="`echo $OCI8_DIR/rdbms/public|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $OCI8_DIR/rdbms/public|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$OCI8_DIR/rdbms/public\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$OCI8_DIR/rdbms/public"`
   fi
 
 
@@ -82173,10 +64256,10 @@ echo "${ECHO_T}$OCI8_LIB_DIR" >&6; }
     ai_p=$OCI8_DIR/rdbms/demo
   else
 
-    ep_dir="`echo $OCI8_DIR/rdbms/demo|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $OCI8_DIR/rdbms/demo|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$OCI8_DIR/rdbms/demo\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$OCI8_DIR/rdbms/demo"`
   fi
 
 
@@ -82207,10 +64290,10 @@ echo "${ECHO_T}$OCI8_LIB_DIR" >&6; }
     ai_p=$OCI8_DIR/network/public
   else
 
-    ep_dir="`echo $OCI8_DIR/network/public|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $OCI8_DIR/network/public|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$OCI8_DIR/network/public\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$OCI8_DIR/network/public"`
   fi
 
 
@@ -82241,10 +64324,10 @@ echo "${ECHO_T}$OCI8_LIB_DIR" >&6; }
     ai_p=$OCI8_DIR/plsql/public
   else
 
-    ep_dir="`echo $OCI8_DIR/plsql/public|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $OCI8_DIR/plsql/public|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$OCI8_DIR/plsql/public\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$OCI8_DIR/plsql/public"`
   fi
 
 
@@ -82323,10 +64406,10 @@ echo "${ECHO_T}$OCI8_LIB_DIR" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -82413,10 +64496,10 @@ echo "${ECHO_T}$OCI8_LIB_DIR" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -82451,8 +64534,8 @@ echo "${ECHO_T}$OCI8_LIB_DIR" >&6; }
     fi
 
 
-  { echo "$as_me:$LINENO: checking Oracle library version compatibility" >&5
-echo $ECHO_N "checking Oracle library version compatibility... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle library version compatibility" >&5
+$as_echo_n "checking Oracle library version compatibility... " >&6; }
   OCI8_LCS_BASE=$OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME
   OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | $PHP_OCI8_TAIL1`  # Oracle 10g, 11g etc
   if test -s "$OCI8_DIR/orainst/unix.rgs"; then
@@ -82473,19 +64556,15 @@ echo $ECHO_N "checking Oracle library version compatibility... $ECHO_C" >&6; }
       OCI8_ORACLE_VERSION=8.1
     fi
   else
-    { { echo "$as_me:$LINENO: error: Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found" >&5
-echo "$as_me: error: Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found" "$LINENO" 5
   fi
-  { echo "$as_me:$LINENO: result: $OCI8_ORACLE_VERSION" >&5
-echo "${ECHO_T}$OCI8_ORACLE_VERSION" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCI8_ORACLE_VERSION" >&5
+$as_echo "$OCI8_ORACLE_VERSION" >&6; }
 
 
     case $OCI8_ORACLE_VERSION in
       7.3|8.0|8.1)
-	{ { echo "$as_me:$LINENO: error: Oracle client libraries < 9.2 are not supported" >&5
-echo "$as_me: error: Oracle client libraries < 9.2 are not supported" >&2;}
-   { (exit 1); exit 1; }; }
+	as_fn_error "Oracle client libraries < 9.2 are not supported" "$LINENO" 5
 	;;
 
       9.0)
@@ -82551,10 +64630,10 @@ echo "$as_me: error: Oracle client libraries < 9.2 are not supported" >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -82586,18 +64665,14 @@ echo "$as_me: error: Oracle client libraries < 9.2 are not supported" >&2;}
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for OCIEnvNlsCreate in -lclntsh" >&5
-echo $ECHO_N "checking for OCIEnvNlsCreate in -lclntsh... $ECHO_C" >&6; }
-if test "${ac_cv_lib_clntsh_OCIEnvNlsCreate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIEnvNlsCreate in -lclntsh" >&5
+$as_echo_n "checking for OCIEnvNlsCreate in -lclntsh... " >&6; }
+if test "${ac_cv_lib_clntsh_OCIEnvNlsCreate+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lclntsh  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -82615,39 +64690,18 @@ return OCIEnvNlsCreate ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_clntsh_OCIEnvNlsCreate=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_clntsh_OCIEnvNlsCreate=no
+  ac_cv_lib_clntsh_OCIEnvNlsCreate=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCIEnvNlsCreate" >&5
-echo "${ECHO_T}$ac_cv_lib_clntsh_OCIEnvNlsCreate" >&6; }
-if test $ac_cv_lib_clntsh_OCIEnvNlsCreate = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIEnvNlsCreate" >&5
+$as_echo "$ac_cv_lib_clntsh_OCIEnvNlsCreate" >&6; }
+if test "x$ac_cv_lib_clntsh_OCIEnvNlsCreate" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -82661,9 +64715,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_clntsh_OCIEnvNlsCreate
 
-	  { { echo "$as_me:$LINENO: error: Oracle client libraries < 9.2 are not supported" >&5
-echo "$as_me: error: Oracle client libraries < 9.2 are not supported" >&2;}
-   { (exit 1); exit 1; }; }
+	  as_fn_error "Oracle client libraries < 9.2 are not supported" "$LINENO" 5
 
 
 fi
@@ -82672,9 +64724,7 @@ fi
 
       *)
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OCI_LOB_READ2 1
-_ACEOF
+$as_echo "#define HAVE_OCI_LOB_READ2 1" >>confdefs.h
 
 	;;
     esac
@@ -82709,10 +64759,10 @@ _ACEOF
     ai_p=$OCI8_DIR/$OCI8_LIB_DIR
   else
 
-    ep_dir="`echo $OCI8_DIR/$OCI8_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $OCI8_DIR/$OCI8_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$OCI8_DIR/$OCI8_LIB_DIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$OCI8_DIR/$OCI8_LIB_DIR"`
   fi
 
 
@@ -83034,9 +65084,7 @@ EOF
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OCI8 1
-_ACEOF
+$as_echo "#define HAVE_OCI8 1" >>confdefs.h
 
 
 
@@ -83071,24 +65119,22 @@ _ACEOF
 
   else
 
-    { echo "$as_me:$LINENO: checking Oracle Instant Client directory" >&5
-echo $ECHO_N "checking Oracle Instant Client directory... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle Instant Client directory" >&5
+$as_echo_n "checking Oracle Instant Client directory... " >&6; }
 
     if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then
                                     PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2> /dev/null | $PHP_OCI8_TAIL1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'`
       if test -z "$PHP_OCI8_INSTANT_CLIENT"; then
-	{ { echo "$as_me:$LINENO: error: Oracle Instant Client directory /usr/lib/oracle/.../client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib libraries not found. Try --with-oci8=instantclient,DIR" >&5
-echo "$as_me: error: Oracle Instant Client directory /usr/lib/oracle/.../client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib libraries not found. Try --with-oci8=instantclient,DIR" >&2;}
-   { (exit 1); exit 1; }; }
+	as_fn_error "Oracle Instant Client directory /usr/lib/oracle/.../client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib libraries not found. Try --with-oci8=instantclient,DIR" "$LINENO" 5
       fi
     fi
-    { echo "$as_me:$LINENO: result: $PHP_OCI8_INSTANT_CLIENT" >&5
-echo "${ECHO_T}$PHP_OCI8_INSTANT_CLIENT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_OCI8_INSTANT_CLIENT" >&5
+$as_echo "$PHP_OCI8_INSTANT_CLIENT" >&6; }
 
     OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT
 
-    { echo "$as_me:$LINENO: checking Oracle Instant Client SDK header directory" >&5
-echo $ECHO_N "checking Oracle Instant Client SDK header directory... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle Instant Client SDK header directory" >&5
+$as_echo_n "checking Oracle Instant Client SDK header directory... " >&6; }
 
         OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib/*$!/usr/include/oracle/\1/client\2!'`
 
@@ -83097,8 +65143,8 @@ echo $ECHO_N "checking Oracle Instant Client SDK header directory... $ECHO_C" >&
         OCISDKMANINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!\(.*\)/lib/*$!\1/include!'`
 
     if test -f "$OCISDKRPMINC/oci.h"; then
-      { echo "$as_me:$LINENO: result: $OCISDKRPMINC" >&5
-echo "${ECHO_T}$OCISDKRPMINC" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKRPMINC" >&5
+$as_echo "$OCISDKRPMINC" >&6; }
 
   if test "$OCISDKRPMINC" != "/usr/include"; then
 
@@ -83106,10 +65152,10 @@ echo "${ECHO_T}$OCISDKRPMINC" >&6; }
     ai_p=$OCISDKRPMINC
   else
 
-    ep_dir="`echo $OCISDKRPMINC|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $OCISDKRPMINC|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$OCISDKRPMINC\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$OCISDKRPMINC"`
   fi
 
 
@@ -83132,8 +65178,8 @@ echo "${ECHO_T}$OCISDKRPMINC" >&6; }
 
       OCI8INCDIR=$OCISDKRPMINC
     elif test -f "$OCISDKZIPINC/oci.h"; then
-      { echo "$as_me:$LINENO: result: $OCISDKZIPINC" >&5
-echo "${ECHO_T}$OCISDKZIPINC" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKZIPINC" >&5
+$as_echo "$OCISDKZIPINC" >&6; }
 
   if test "$OCISDKZIPINC" != "/usr/include"; then
 
@@ -83141,10 +65187,10 @@ echo "${ECHO_T}$OCISDKZIPINC" >&6; }
     ai_p=$OCISDKZIPINC
   else
 
-    ep_dir="`echo $OCISDKZIPINC|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $OCISDKZIPINC|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$OCISDKZIPINC\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$OCISDKZIPINC"`
   fi
 
 
@@ -83167,8 +65213,8 @@ echo "${ECHO_T}$OCISDKZIPINC" >&6; }
 
       OCI8INCDIR=$OCISDKZIPINC
     elif test -f "$OCISDKMANINC/oci.h"; then
-      { echo "$as_me:$LINENO: result: $OCISDKMANINC" >&5
-echo "${ECHO_T}$OCISDKMANINC" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKMANINC" >&5
+$as_echo "$OCISDKMANINC" >&6; }
 
   if test "$OCISDKMANINC" != "/usr/include"; then
 
@@ -83176,10 +65222,10 @@ echo "${ECHO_T}$OCISDKMANINC" >&6; }
     ai_p=$OCISDKMANINC
   else
 
-    ep_dir="`echo $OCISDKMANINC|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $OCISDKMANINC|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$OCISDKMANINC\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$OCISDKMANINC"`
   fi
 
 
@@ -83202,9 +65248,7 @@ echo "${ECHO_T}$OCISDKMANINC" >&6; }
 
       OCI8INCDIR=$OCISDKMANINC
     else
-      { { echo "$as_me:$LINENO: error: Oracle Instant Client SDK header files not found" >&5
-echo "$as_me: error: Oracle Instant Client SDK header files not found" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Oracle Instant Client SDK header files not found" "$LINENO" 5
     fi
 
     OCISYSLIBLIST=`echo "$OCI8INCDIR" | $PHP_OCI8_SED -e 's!\(.*\)/include$!\1/demo/sysliblist!'`
@@ -83263,10 +65307,10 @@ echo "$as_me: error: Oracle Instant Client SDK header files not found" >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -83301,25 +65345,21 @@ echo "$as_me: error: Oracle Instant Client SDK header files not found" >&2;}
     fi
 
 
-  { echo "$as_me:$LINENO: checking Oracle Instant Client library version compatibility" >&5
-echo $ECHO_N "checking Oracle Instant Client library version compatibility... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle Instant Client library version compatibility" >&5
+$as_echo_n "checking Oracle Instant Client library version compatibility... " >&6; }
   OCI8_LCS_BASE=$PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME
   OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | $PHP_OCI8_TAIL1`  # Oracle 10g, 11g etc
   OCI8_NNZ=`ls $PHP_OCI8_INSTANT_CLIENT/libnnz*.$SHLIB_SUFFIX_NAME 2> /dev/null | $PHP_OCI8_TAIL1`
   if test -f "$OCI8_NNZ" && test -f "$OCI8_LCS"; then
     if test ! -f "$OCI8_LCS_BASE"; then
-      { { echo "$as_me:$LINENO: error: Link from $OCI8_LCS_BASE to $OCI8_LCS_BASE.*.1 not found" >&5
-echo "$as_me: error: Link from $OCI8_LCS_BASE to $OCI8_LCS_BASE.*.1 not found" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Link from $OCI8_LCS_BASE to $OCI8_LCS_BASE.*.1 not found" "$LINENO" 5
     fi
     OCI8_ORACLE_VERSION=`echo $OCI8_LCS | $PHP_OCI8_SED -e 's/.*\.\(.*\)\.1$/\1.1/'`
   else
-    { { echo "$as_me:$LINENO: error: Oracle Instant Client libraries libnnz.$SHLIB_SUFFIX_NAME and libclntsh.$SHLIB_SUFFIX_NAME not found" >&5
-echo "$as_me: error: Oracle Instant Client libraries libnnz.$SHLIB_SUFFIX_NAME and libclntsh.$SHLIB_SUFFIX_NAME not found" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Oracle Instant Client libraries libnnz.$SHLIB_SUFFIX_NAME and libclntsh.$SHLIB_SUFFIX_NAME not found" "$LINENO" 5
   fi
-  { echo "$as_me:$LINENO: result: $OCI8_ORACLE_VERSION" >&5
-echo "${ECHO_T}$OCI8_ORACLE_VERSION" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCI8_ORACLE_VERSION" >&5
+$as_echo "$OCI8_ORACLE_VERSION" >&6; }
 
 
 
@@ -83351,10 +65391,10 @@ echo "${ECHO_T}$OCI8_ORACLE_VERSION" >&6; }
     ai_p=$PHP_OCI8_INSTANT_CLIENT
   else
 
-    ep_dir="`echo $PHP_OCI8_INSTANT_CLIENT|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_OCI8_INSTANT_CLIENT|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_OCI8_INSTANT_CLIENT\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_OCI8_INSTANT_CLIENT"`
   fi
 
 
@@ -83384,14 +65424,10 @@ echo "${ECHO_T}$OCI8_ORACLE_VERSION" >&6; }
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OCI_INSTANT_CLIENT 1
-_ACEOF
+$as_echo "#define HAVE_OCI_INSTANT_CLIENT 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OCI_LOB_READ2 1
-_ACEOF
+$as_echo "#define HAVE_OCI_LOB_READ2 1" >>confdefs.h
 
 
 
@@ -83688,9 +65724,7 @@ EOF
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OCI8 1
-_ACEOF
+$as_echo "#define HAVE_OCI8 1" >>confdefs.h
 
 
 
@@ -83733,7 +65767,7 @@ php_with_adabas=no
 
 
 # Check whether --with-adabas was given.
-if test "${with_adabas+set}" = set; then
+if test "${with_adabas+set}" = set; then :
   withval=$with_adabas; PHP_ADABAS=$withval
 else
 
@@ -83771,8 +65805,8 @@ esac
 
 
   if test "$PHP_ADABAS" != "no"; then
-    { echo "$as_me:$LINENO: checking for Adabas support" >&5
-echo $ECHO_N "checking for Adabas support... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Adabas support" >&5
+$as_echo_n "checking for Adabas support... " >&6; }
     if test "$PHP_ADABAS" = "yes"; then
       PHP_ADABAS=/usr/local
     fi
@@ -83783,10 +65817,10 @@ echo $ECHO_N "checking for Adabas support... $ECHO_C" >&6; }
     ai_p=$PHP_ADABAS/incl
   else
 
-    ep_dir="`echo $PHP_ADABAS/incl|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_ADABAS/incl|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ADABAS/incl\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_ADABAS/incl"`
   fi
 
 
@@ -83814,10 +65848,10 @@ echo $ECHO_N "checking for Adabas support... $ECHO_C" >&6; }
     ai_p=$PHP_ADABAS/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $PHP_ADABAS/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_ADABAS/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ADABAS/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_ADABAS/$PHP_LIBDIR"`
   fi
 
 
@@ -83875,10 +65909,10 @@ echo $ECHO_N "checking for Adabas support... $ECHO_C" >&6; }
     ai_p=$abs_builddir/ext/odbc
   else
 
-    ep_dir="`echo $abs_builddir/ext/odbc|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $abs_builddir/ext/odbc|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$abs_builddir/ext/odbc\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$abs_builddir/ext/odbc"`
   fi
 
 
@@ -83918,18 +65952,14 @@ echo $ECHO_N "checking for Adabas support... $ECHO_C" >&6; }
     ODBC_INCDIR=$PHP_ADABAS/incl
 
 if ! test -f "$ODBC_INCDIR/sqlext.h"; then
-  { { echo "$as_me:$LINENO: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" >&5
-echo "$as_me: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" "$LINENO" 5
 fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ADABAS 1
-_ACEOF
+$as_echo "#define HAVE_ADABAS 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
   fi
 fi
 
@@ -83940,7 +65970,7 @@ php_with_sapdb=no
 
 
 # Check whether --with-sapdb was given.
-if test "${with_sapdb+set}" = set; then
+if test "${with_sapdb+set}" = set; then :
   withval=$with_sapdb; PHP_SAPDB=$withval
 else
 
@@ -83978,8 +66008,8 @@ esac
 
 
   if test "$PHP_SAPDB" != "no"; then
-    { echo "$as_me:$LINENO: checking for SAP DB support" >&5
-echo $ECHO_N "checking for SAP DB support... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SAP DB support" >&5
+$as_echo_n "checking for SAP DB support... " >&6; }
     if test "$PHP_SAPDB" = "yes"; then
       PHP_SAPDB=/usr/local
     fi
@@ -83990,10 +66020,10 @@ echo $ECHO_N "checking for SAP DB support... $ECHO_C" >&6; }
     ai_p=$PHP_SAPDB/incl
   else
 
-    ep_dir="`echo $PHP_SAPDB/incl|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_SAPDB/incl|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_SAPDB/incl\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_SAPDB/incl"`
   fi
 
 
@@ -84021,10 +66051,10 @@ echo $ECHO_N "checking for SAP DB support... $ECHO_C" >&6; }
     ai_p=$PHP_SAPDB/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $PHP_SAPDB/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_SAPDB/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_SAPDB/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_SAPDB/$PHP_LIBDIR"`
   fi
 
 
@@ -84059,12 +66089,10 @@ echo $ECHO_N "checking for SAP DB support... $ECHO_C" >&6; }
 
     ODBC_TYPE=sapdb
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SAPDB 1
-_ACEOF
+$as_echo "#define HAVE_SAPDB 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
   fi
 fi
 
@@ -84075,7 +66103,7 @@ php_with_solid=no
 
 
 # Check whether --with-solid was given.
-if test "${with_solid+set}" = set; then
+if test "${with_solid+set}" = set; then :
   withval=$with_solid; PHP_SOLID=$withval
 else
 
@@ -84113,8 +66141,8 @@ esac
 
 
   if test "$PHP_SOLID" != "no"; then
-    { echo "$as_me:$LINENO: checking for Solid support" >&5
-echo $ECHO_N "checking for Solid support... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solid support" >&5
+$as_echo_n "checking for Solid support... " >&6; }
     if test "$PHP_SOLID" = "yes"; then
       PHP_SOLID=/usr/local/solid
     fi
@@ -84124,28 +66152,22 @@ echo $ECHO_N "checking for Solid support... $ECHO_C" >&6; }
     ODBC_TYPE=solid
     if test -f $ODBC_LIBDIR/soc*35.a; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SOLID_35 1
-_ACEOF
+$as_echo "#define HAVE_SOLID_35 1" >>confdefs.h
 
     elif test -f $ODBC_LIBDIR/scl*30.a; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SOLID_30 1
-_ACEOF
+$as_echo "#define HAVE_SOLID_30 1" >>confdefs.h
 
     elif test -f $ODBC_LIBDIR/scl*23.a; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SOLID 1
-_ACEOF
+$as_echo "#define HAVE_SOLID 1" >>confdefs.h
 
     fi
-    { echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
-  { echo "$as_me:$LINENO: checking Solid library file" >&5
-echo $ECHO_N "checking Solid library file... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Solid library file" >&5
+$as_echo_n "checking Solid library file... " >&6; }
   ac_solid_uname_r=`uname -r 2>/dev/null`
   ac_solid_uname_s=`uname -s 2>/dev/null`
   case $ac_solid_uname_s in
@@ -84155,16 +66177,12 @@ echo $ECHO_N "checking Solid library file... $ECHO_C" >&6; }
     Linux)
       if ldd -v /bin/sh | grep GLIBC > /dev/null; then
 
-cat >>confdefs.h <<\_ACEOF
-#define SS_LINUX 1
-_ACEOF
+$as_echo "#define SS_LINUX 1" >>confdefs.h
 
         ac_solid_os=l2x
       else
 
-cat >>confdefs.h <<\_ACEOF
-#define SS_LINUX 1
-_ACEOF
+$as_echo "#define SS_LINUX 1" >>confdefs.h
 
         ac_solid_os=lux
       fi;;
@@ -84173,16 +66191,12 @@ _ACEOF
     FreeBSD)
       if test `expr $ac_solid_uname_r : '\(.\)'` -gt "2"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define SS_FBX 1
-_ACEOF
+$as_echo "#define SS_FBX 1" >>confdefs.h
 
         ac_solid_os=fex
       else
 
-cat >>confdefs.h <<\_ACEOF
-#define SS_FBX 1
-_ACEOF
+$as_echo "#define SS_FBX 1" >>confdefs.h
 
         ac_solid_os=fbx
       fi;;
@@ -84219,8 +66233,8 @@ else
   ODBC_LIBS=-l${ac_solid_prefix}${ac_solid_os}${ac_solid_version}
 fi
 
-  { echo "$as_me:$LINENO: result: \`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&5
-echo "${ECHO_T}\`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: \`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&5
+$as_echo "\`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&6; }
 
   fi
 fi
@@ -84232,7 +66246,7 @@ php_with_ibm_db2=no
 
 
 # Check whether --with-ibm-db2 was given.
-if test "${with_ibm_db2+set}" = set; then
+if test "${with_ibm_db2+set}" = set; then :
   withval=$with_ibm_db2; PHP_IBM_DB2=$withval
 else
 
@@ -84270,8 +66284,8 @@ esac
 
 
   if test "$PHP_IBM_DB2" != "no"; then
-    { echo "$as_me:$LINENO: checking for IBM DB2 support" >&5
-echo $ECHO_N "checking for IBM DB2 support... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IBM DB2 support" >&5
+$as_echo_n "checking for IBM DB2 support... " >&6; }
     if test "$PHP_IBM_DB2" = "yes"; then
       ODBC_INCDIR=/home/db2inst1/sqllib/include
       ODBC_LIBDIR=/home/db2inst1/sqllib/lib
@@ -84282,9 +66296,7 @@ echo $ECHO_N "checking for IBM DB2 support... $ECHO_C" >&6; }
 
 
 if ! test -f "$ODBC_INCDIR/sqlcli1.h"; then
-  { { echo "$as_me:$LINENO: error: ODBC header file '$ODBC_INCDIR/sqlcli1.h' not found!" >&5
-echo "$as_me: error: ODBC header file '$ODBC_INCDIR/sqlcli1.h' not found!" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "ODBC header file '$ODBC_INCDIR/sqlcli1.h' not found!" "$LINENO" 5
 fi
 
 
@@ -84298,16 +66310,12 @@ fi
   LIBS="
       $ODBC_LFLAGS $ODBC_LIBS
      $LIBS"
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
     LIBS=$old_LIBS
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -84318,68 +66326,36 @@ cat >>conftest.$ac_ext <<_ACEOF
     }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     LIBS=$old_LIBS
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IBMDB2 1
-_ACEOF
+$as_echo "#define HAVE_IBMDB2 1" >>confdefs.h
 
-      { echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     LIBS=$old_LIBS
 
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-      { { echo "$as_me:$LINENO: error:
-build test failed. Please check the config.log for details.
-You need to source your DB2 environment before running PHP configure:
-# . \$IBM_DB2/db2profile
-" >&5
-echo "$as_me: error:
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+      as_fn_error "
 build test failed. Please check the config.log for details.
 You need to source your DB2 environment before running PHP configure:
 # . \$IBM_DB2/db2profile
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
-
   fi
 fi
 
@@ -84390,7 +66366,7 @@ php_with_odbcrouter=no
 
 
 # Check whether --with-ODBCRouter was given.
-if test "${with_ODBCRouter+set}" = set; then
+if test "${with_ODBCRouter+set}" = set; then :
   withval=$with_ODBCRouter; PHP_ODBCROUTER=$withval
 else
 
@@ -84428,8 +66404,8 @@ esac
 
 
   if test "$PHP_ODBCROUTER" != "no"; then
-    { echo "$as_me:$LINENO: checking for ODBCRouter.com support" >&5
-echo $ECHO_N "checking for ODBCRouter.com support... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ODBCRouter.com support" >&5
+$as_echo_n "checking for ODBCRouter.com support... " >&6; }
     if test "$PHP_ODBCROUTER" = "yes"; then
       PHP_ODBCROUTER=/usr
     fi
@@ -84440,12 +66416,10 @@ echo $ECHO_N "checking for ODBCRouter.com support... $ECHO_C" >&6; }
     ODBC_LIBS=-lodbcsdk
     ODBC_TYPE=ODBCRouter
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ODBC_ROUTER 1
-_ACEOF
+$as_echo "#define HAVE_ODBC_ROUTER 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
   fi
 fi
 
@@ -84456,7 +66430,7 @@ php_with_empress=no
 
 
 # Check whether --with-empress was given.
-if test "${with_empress+set}" = set; then
+if test "${with_empress+set}" = set; then :
   withval=$with_empress; PHP_EMPRESS=$withval
 else
 
@@ -84494,8 +66468,8 @@ esac
 
 
   if test "$PHP_EMPRESS" != "no"; then
-    { echo "$as_me:$LINENO: checking for Empress support" >&5
-echo $ECHO_N "checking for Empress support... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Empress support" >&5
+$as_echo_n "checking for Empress support... " >&6; }
     if test "$PHP_EMPRESS" = "yes"; then
       ODBC_INCDIR=$EMPRESSPATH/include/odbc
       ODBC_LIBDIR=$EMPRESSPATH/shlib
@@ -84507,21 +66481,19 @@ echo $ECHO_N "checking for Empress support... $ECHO_C" >&6; }
     ODBC_LFLAGS=-L$ODBC_LIBDIR
     ODBC_TYPE=empress
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_EMPRESS 1
-_ACEOF
+$as_echo "#define HAVE_EMPRESS 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
-  { echo "$as_me:$LINENO: checking Empress library file" >&5
-echo $ECHO_N "checking Empress library file... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Empress library file" >&5
+$as_echo_n "checking Empress library file... " >&6; }
   ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1`
   if test ! -f $ODBC_LIBS; then
     ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1`
   fi
-  { echo "$as_me:$LINENO: result: \`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&5
-echo "${ECHO_T}\`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: \`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&5
+$as_echo "\`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&6; }
 
   fi
 fi
@@ -84533,7 +66505,7 @@ php_with_empress_bcs=no
 
 
 # Check whether --with-empress-bcs was given.
-if test "${with_empress_bcs+set}" = set; then
+if test "${with_empress_bcs+set}" = set; then :
   withval=$with_empress_bcs; PHP_EMPRESS_BCS=$withval
 else
 
@@ -84571,8 +66543,8 @@ esac
 
 
   if test "$PHP_EMPRESS_BCS" != "no"; then
-    { echo "$as_me:$LINENO: checking for Empress local access support" >&5
-echo $ECHO_N "checking for Empress local access support... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Empress local access support" >&5
+$as_echo_n "checking for Empress local access support... " >&6; }
     if test "$PHP_EMPRESS_BCS" = "yes"; then
       ODBC_INCDIR=$EMPRESSPATH/include/odbc
       ODBC_LIBDIR=$EMPRESSPATH/shlib
@@ -84600,21 +66572,19 @@ echo $ECHO_N "checking for Empress local access support... $ECHO_C" >&6; }
     ODBC_LIBS="-lempphpbcs -lms -lmscfg -lbasic -lbasic_os -lnlscstab -lnlsmsgtab -lm -ldl -lcrypt"
     ODBC_TYPE=empress-bcs
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_EMPRESS 1
-_ACEOF
+$as_echo "#define HAVE_EMPRESS 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
-  { echo "$as_me:$LINENO: checking Empress local access library file" >&5
-echo $ECHO_N "checking Empress local access library file... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Empress local access library file" >&5
+$as_echo_n "checking Empress local access library file... " >&6; }
   ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1`
   if test ! -f $ODBCBCS_LIBS; then
     ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1`
   fi
-  { echo "$as_me:$LINENO: result: \`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'\`" >&5
-echo "${ECHO_T}\`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'\`" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: \`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'\`" >&5
+$as_echo "\`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'\`" >&6; }
 
   fi
 fi
@@ -84626,7 +66596,7 @@ php_with_birdstep=no
 
 
 # Check whether --with-birdstep was given.
-if test "${with_birdstep+set}" = set; then
+if test "${with_birdstep+set}" = set; then :
   withval=$with_birdstep; PHP_BIRDSTEP=$withval
 else
 
@@ -84664,8 +66634,8 @@ esac
 
 
   if test "$PHP_BIRDSTEP" != "no"; then
-    { echo "$as_me:$LINENO: checking for Birdstep support" >&5
-echo $ECHO_N "checking for Birdstep support... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Birdstep support" >&5
+$as_echo_n "checking for Birdstep support... " >&6; }
     if test "$PHP_BIRDSTEP" = "yes"; then
         ODBC_INCDIR=/usr/local/birdstep/include
         ODBC_LIBDIR=/usr/local/birdstep/lib
@@ -84677,45 +66647,31 @@ echo $ECHO_N "checking for Birdstep support... $ECHO_C" >&6; }
     case $host_alias in
       *aix*)
 
-cat >>confdefs.h <<\_ACEOF
-#define AIX 1
-_ACEOF
+$as_echo "#define AIX 1" >>confdefs.h
 ;;
       *hpux*)
 
-cat >>confdefs.h <<\_ACEOF
-#define HPUX 1
-_ACEOF
+$as_echo "#define HPUX 1" >>confdefs.h
 ;;
       *linux*)
 
-cat >>confdefs.h <<\_ACEOF
-#define LINUX 1
-_ACEOF
+$as_echo "#define LINUX 1" >>confdefs.h
 ;;
       *qnx*)
 
-cat >>confdefs.h <<\_ACEOF
-#define NEUTRINO 1
-_ACEOF
+$as_echo "#define NEUTRINO 1" >>confdefs.h
 ;;
       i?86-*-solaris*)
 
-cat >>confdefs.h <<\_ACEOF
-#define ISOLARIS 1
-_ACEOF
+$as_echo "#define ISOLARIS 1" >>confdefs.h
 ;;
       sparc-*-solaris*)
 
-cat >>confdefs.h <<\_ACEOF
-#define SOLARIS 1
-_ACEOF
+$as_echo "#define SOLARIS 1" >>confdefs.h
 ;;
       *unixware*)
 
-cat >>confdefs.h <<\_ACEOF
-#define UNIXWARE 1
-_ACEOF
+$as_echo "#define UNIXWARE 1" >>confdefs.h
 ;;
     esac
 
@@ -84731,12 +66687,10 @@ _ACEOF
     fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BIRDSTEP 1
-_ACEOF
+$as_echo "#define HAVE_BIRDSTEP 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
   fi
 fi
 
@@ -84747,7 +66701,7 @@ php_with_custom_odbc=no
 
 
 # Check whether --with-custom-odbc was given.
-if test "${with_custom_odbc+set}" = set; then
+if test "${with_custom_odbc+set}" = set; then :
   withval=$with_custom_odbc; PHP_CUSTOM_ODBC=$withval
 else
 
@@ -84785,8 +66739,8 @@ esac
 
 
   if test "$PHP_CUSTOM_ODBC" != "no"; then
-    { echo "$as_me:$LINENO: checking for a custom ODBC support" >&5
-echo $ECHO_N "checking for a custom ODBC support... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a custom ODBC support" >&5
+$as_echo_n "checking for a custom ODBC support... " >&6; }
     if test "$PHP_CUSTOM_ODBC" = "yes"; then
       PHP_CUSTOM_ODBC=/usr/local
     fi
@@ -84797,12 +66751,10 @@ echo $ECHO_N "checking for a custom ODBC support... $ECHO_C" >&6; }
     ODBC_LIBS=$CUSTOM_ODBC_LIBS
     ODBC_TYPE=custom-odbc
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CODBC 1
-_ACEOF
+$as_echo "#define HAVE_CODBC 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: $ext_ouput" >&5
-echo "${ECHO_T}$ext_ouput" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_ouput" >&5
+$as_echo "$ext_ouput" >&6; }
   fi
 fi
 
@@ -84813,7 +66765,7 @@ php_with_iodbc=no
 
 
 # Check whether --with-iodbc was given.
-if test "${with_iodbc+set}" = set; then
+if test "${with_iodbc+set}" = set; then :
   withval=$with_iodbc; PHP_IODBC=$withval
 else
 
@@ -84851,11 +66803,52 @@ esac
 
 
   if test "$PHP_IODBC" != "no"; then
-    { echo "$as_me:$LINENO: checking for iODBC support" >&5
-echo $ECHO_N "checking for iODBC support... $ECHO_C" >&6; }
-    if test "$PHP_IODBC" = "yes"; then
-      PHP_IODBC=/usr/local
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iODBC support" >&5
+$as_echo_n "checking for iODBC support... " >&6; }
+    if test -z "$PKG_CONFIG"; then
+      # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; 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.
+  ;;
+  *)
+  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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
     fi
+    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
 
 
   if test -n "$PHP_IODBC/$PHP_LIBDIR"; then
@@ -84866,10 +66859,115 @@ echo $ECHO_N "checking for iODBC support... $ECHO_C" >&6; }
     ai_p=$PHP_IODBC/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $PHP_IODBC/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_IODBC/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_IODBC/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_IODBC/$PHP_LIBDIR"`
+  fi
+
+
+
+
+
+  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
+
+  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
+  if test -n "$unique" && test "`eval $cmd`" = "" ; then
+    eval "LIBPATH$unique=set"
+
+    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
+    LDFLAGS="$LDFLAGS -L$ai_p"
+    PHP_RPATHS="$PHP_RPATHS $ai_p"
+
+  fi
+
+
+
+  fi
+
+  fi
+
+
+  case iodbc in
+  c|c_r|pthread*) ;;
+  *)
+      LIBS="-liodbc $LIBS"
+   ;;
+  esac
+
+
+
+
+      ODBC_TYPE=iodbc
+      ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
+      ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
+      ODBC_LIBS=`$PKG_CONFIG --libs-only-l libiodbc`
+
+  for ac_i in $ODBC_INCLUDE; do
+    case $ac_i in
+    -I*)
+      ac_ii=`echo $ac_i|cut -c 3-`
+
+  if test "$ac_ii" != "/usr/include"; then
+
+  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
+    ai_p=$ac_ii
+  else
+
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
+
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
+  fi
+
+
+
+  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
+
+  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
+  if test -n "$unique" && test "`eval $cmd`" = "" ; then
+    eval "INCLUDEPATH$unique=set"
+
+      if test ""; then
+        INCLUDES="-I$ai_p $INCLUDES"
+      else
+        INCLUDES="$INCLUDES -I$ai_p"
+      fi
+
+  fi
+
+  fi
+
+    ;;
+    esac
+  done
+
+
+$as_echo "#define HAVE_IODBC 1" >>confdefs.h
+
+
+$as_echo "#define HAVE_ODBC2 1" >>confdefs.h
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
+    else
+      if test "$PHP_IODBC" = "yes"; then
+        PHP_IODBC=/usr/local
+      fi
+
+
+  if test -n "$PHP_IODBC/$PHP_LIBDIR"; then
+
+  if test "$PHP_IODBC/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_IODBC/$PHP_LIBDIR" != "/usr/lib"; then
+
+  if test -z "$PHP_IODBC/$PHP_LIBDIR" || echo "$PHP_IODBC/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
+    ai_p=$PHP_IODBC/$PHP_LIBDIR
+  else
+
+    ep_dir=`echo $PHP_IODBC/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
+
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_IODBC/$PHP_LIBDIR"`
   fi
 
 
@@ -84912,10 +67010,10 @@ echo $ECHO_N "checking for iODBC support... $ECHO_C" >&6; }
     ai_p=$PHP_IODBC/include
   else
 
-    ep_dir="`echo $PHP_IODBC/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_IODBC/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_IODBC/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_IODBC/include"`
   fi
 
 
@@ -84936,22 +67034,19 @@ echo $ECHO_N "checking for iODBC support... $ECHO_C" >&6; }
 
   fi
 
-    ODBC_TYPE=iodbc
-    ODBC_INCLUDE=-I$PHP_IODBC/include
-    ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
-    ODBC_LIBS=-liodbc
+      ODBC_TYPE=iodbc
+      ODBC_INCLUDE=-I$PHP_IODBC/include
+      ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
+      ODBC_LIBS=-liodbc
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IODBC 1
-_ACEOF
+$as_echo "#define HAVE_IODBC 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ODBC2 1
-_ACEOF
+$as_echo "#define HAVE_ODBC2 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
+    fi
   fi
 fi
 
@@ -84962,7 +67057,7 @@ php_with_esoob=no
 
 
 # Check whether --with-esoob was given.
-if test "${with_esoob+set}" = set; then
+if test "${with_esoob+set}" = set; then :
   withval=$with_esoob; PHP_ESOOB=$withval
 else
 
@@ -85000,8 +67095,8 @@ esac
 
 
   if test "$PHP_ESOOB" != "no"; then
-    { echo "$as_me:$LINENO: checking for Easysoft ODBC-ODBC Bridge support" >&5
-echo $ECHO_N "checking for Easysoft ODBC-ODBC Bridge support... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Easysoft ODBC-ODBC Bridge support" >&5
+$as_echo_n "checking for Easysoft ODBC-ODBC Bridge support... " >&6; }
     if test "$PHP_ESOOB" = "yes"; then
       PHP_ESOOB=/usr/local/easysoft/oob/client
     fi
@@ -85012,12 +67107,10 @@ echo $ECHO_N "checking for Easysoft ODBC-ODBC Bridge support... $ECHO_C" >&6; }
     ODBC_LIBS=-lesoobclient
     ODBC_TYPE=esoob
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ESOOB 1
-_ACEOF
+$as_echo "#define HAVE_ESOOB 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
   fi
 fi
 
@@ -85028,7 +67121,7 @@ php_with_unixodbc=no
 
 
 # Check whether --with-unixODBC was given.
-if test "${with_unixODBC+set}" = set; then
+if test "${with_unixODBC+set}" = set; then :
   withval=$with_unixODBC; PHP_UNIXODBC=$withval
 else
 
@@ -85066,8 +67159,8 @@ esac
 
 
   if test "$PHP_UNIXODBC" != "no"; then
-    { echo "$as_me:$LINENO: checking for unixODBC support" >&5
-echo $ECHO_N "checking for unixODBC support... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unixODBC support" >&5
+$as_echo_n "checking for unixODBC support... " >&6; }
     if test "$PHP_UNIXODBC" = "yes"; then
       PHP_UNIXODBC=/usr/local
     fi
@@ -85079,18 +67172,14 @@ echo $ECHO_N "checking for unixODBC support... $ECHO_C" >&6; }
     ODBC_TYPE=unixODBC
 
 if ! test -f "$ODBC_INCDIR/sqlext.h"; then
-  { { echo "$as_me:$LINENO: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" >&5
-echo "$as_me: error: ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" "$LINENO" 5
 fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UNIXODBC 1
-_ACEOF
+$as_echo "#define HAVE_UNIXODBC 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
   fi
 fi
 
@@ -85101,7 +67190,7 @@ php_with_dbmaker=no
 
 
 # Check whether --with-dbmaker was given.
-if test "${with_dbmaker+set}" = set; then
+if test "${with_dbmaker+set}" = set; then :
   withval=$with_dbmaker; PHP_DBMAKER=$withval
 else
 
@@ -85139,8 +67228,8 @@ esac
 
 
   if test "$PHP_DBMAKER" != "no"; then
-    { echo "$as_me:$LINENO: checking for DBMaker support" >&5
-echo $ECHO_N "checking for DBMaker support... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBMaker support" >&5
+$as_echo_n "checking for DBMaker support... " >&6; }
     if test "$PHP_DBMAKER" = "yes"; then
       # find dbmaker's home directory
       DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'`
@@ -85171,19 +67260,17 @@ echo $ECHO_N "checking for DBMaker support... $ECHO_C" >&6; }
     ODBC_TYPE=dbmaker
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DBMAKER 1
-_ACEOF
+$as_echo "#define HAVE_DBMAKER 1" >>confdefs.h
 
 
     if test "$ext_shared" = "yes"; then
-      { echo "$as_me:$LINENO: result: yes (shared)" >&5
-echo "${ECHO_T}yes (shared)" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (shared)" >&5
+$as_echo "yes (shared)" >&6; }
       ODBC_LIBS="-ldmapic -lc -lm"
       ODBC_SHARED="odbc.la"
     else
-      { echo "$as_me:$LINENO: result: yes (static)" >&5
-echo "${ECHO_T}yes (static)" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (static)" >&5
+$as_echo "yes (static)" >&6; }
 
 
   if test -n "$ODBC_LIBDIR"; then
@@ -85194,10 +67281,10 @@ echo "${ECHO_T}yes (static)" >&6; }
     ai_p=$ODBC_LIBDIR
   else
 
-    ep_dir="`echo $ODBC_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ODBC_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ODBC_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ODBC_LIBDIR"`
   fi
 
 
@@ -85240,10 +67327,10 @@ echo "${ECHO_T}yes (static)" >&6; }
     ai_p=$ODBC_INCDIR
   else
 
-    ep_dir="`echo $ODBC_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ODBC_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ODBC_INCDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ODBC_INCDIR"`
   fi
 
 
@@ -85325,10 +67412,10 @@ if test -n "$ODBC_TYPE"; then
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -85362,17 +67449,13 @@ if test -n "$ODBC_TYPE"; then
 
     if test "$ODBC_TYPE" != "birdstep" && test "$ODBC_TYPE" != "solid"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SQLDATASOURCES 1
-_ACEOF
+$as_echo "#define HAVE_SQLDATASOURCES 1" >>confdefs.h
 
     fi
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UODBC 1
-_ACEOF
+$as_echo "#define HAVE_UODBC 1" >>confdefs.h
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_SHARED_LIBADD"
@@ -85707,10 +67790,10 @@ fi
 
 php_enable_pcntl=no
 
-{ echo "$as_me:$LINENO: checking whether to enable pcntl support" >&5
-echo $ECHO_N "checking whether to enable pcntl support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable pcntl support" >&5
+$as_echo_n "checking whether to enable pcntl support... " >&6; }
 # Check whether --enable-pcntl was given.
-if test "${enable_pcntl+set}" = set; then
+if test "${enable_pcntl+set}" = set; then :
   enableval=$enable_pcntl; PHP_PCNTL=$enableval
 else
 
@@ -85742,413 +67825,66 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_PCNTL" != "no"; then
-
-for ac_func in fork
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+  for ac_func in fork
+do :
+  ac_fn_c_check_func "$LINENO" "fork" "ac_cv_func_fork"
+if test "x$ac_cv_func_fork" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-cat >>confdefs.h <<\_ACEOF
 #define HAVE_FORK 1
 _ACEOF
 
-else
-   { { echo "$as_me:$LINENO: error: pcntl: fork() not supported by this platform" >&5
-echo "$as_me: error: pcntl: fork() not supported by this platform" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-done
+$as_echo "#define HAVE_FORK 1" >>confdefs.h
 
-
-for ac_func in waitpid
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
+   as_fn_error "pcntl: fork() not supported by this platform" "$LINENO" 5
 fi
+done
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+  for ac_func in waitpid
+do :
+  ac_fn_c_check_func "$LINENO" "waitpid" "ac_cv_func_waitpid"
+if test "x$ac_cv_func_waitpid" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-cat >>confdefs.h <<\_ACEOF
 #define HAVE_WAITPID 1
 _ACEOF
 
-else
-   { { echo "$as_me:$LINENO: error: pcntl: waitpid() not supported by this platform" >&5
-echo "$as_me: error: pcntl: waitpid() not supported by this platform" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-done
-
+$as_echo "#define HAVE_WAITPID 1" >>confdefs.h
 
-for ac_func in sigaction
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
+   as_fn_error "pcntl: waitpid() not supported by this platform" "$LINENO" 5
 fi
+done
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+  for ac_func in sigaction
+do :
+  ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction"
+if test "x$ac_cv_func_sigaction" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-cat >>confdefs.h <<\_ACEOF
 #define HAVE_SIGACTION 1
 _ACEOF
 
-else
-   { { echo "$as_me:$LINENO: error: pcntl: sigaction() not supported by this platform" >&5
-echo "$as_me: error: pcntl: sigaction() not supported by this platform" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-done
-
+$as_echo "#define HAVE_SIGACTION 1" >>confdefs.h
 
-
-
-
-
-
-for ac_func in getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
+   as_fn_error "pcntl: sigaction() not supported by this platform" "$LINENO" 5
 fi
+done
 
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+  for ac_func in getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait
+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"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -86455,10 +68191,10 @@ fi
 
 php_enable_pdo=yes
 
-{ echo "$as_me:$LINENO: checking whether to enable PDO support" >&5
-echo $ECHO_N "checking whether to enable PDO support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable PDO support" >&5
+$as_echo_n "checking whether to enable PDO support... " >&6; }
 # Check whether --enable-pdo was given.
-if test "${enable_pdo+set}" = set; then
+if test "${enable_pdo+set}" = set; then :
   enableval=$enable_pdo; PHP_PDO=$enableval
 else
 
@@ -86490,8 +68226,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -86512,7 +68248,7 @@ if test "$PHP_PDO" != "no"; then
     # we're running in an environment that smells like pear,
     # and the PHP_PEAR_VERSION env var is not set.  That implies
     # that we're running under a slightly broken pear installer
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 PDO requires that you upgrade your PEAR installer tools. Please
 do so now by running:
 
@@ -86521,39 +68257,20 @@ do so now by running:
 or by manually downloading and installing PEAR version 1.3.5 or higher.
 
 Once you've upgraded, please re-try your PDO install.
-    " >&5
-echo "$as_me: error:
-PDO requires that you upgrade your PEAR installer tools. Please
-do so now by running:
-
-  % sudo pear upgrade pear
-
-or by manually downloading and installing PEAR version 1.3.5 or higher.
-
-Once you've upgraded, please re-try your PDO install.
-    " >&2;}
-   { (exit 1); exit 1; }; }
+    " "$LINENO" 5
   fi
 
 
   if test "$ext_shared" = "yes" ; then
     case $host_alias in
       *darwin*)
-          { { echo "$as_me:$LINENO: error:
-Due to the way that loadable modules work on OSX/Darwin, you need to
-compile the PDO package statically into the PHP core.
-
-Please follow the instructions at: http://netevil.org/node.php?nid=202
-for more detail on this issue.
-          " >&5
-echo "$as_me: error:
+          as_fn_error "
 Due to the way that loadable modules work on OSX/Darwin, you need to
 compile the PDO package statically into the PHP core.
 
 Please follow the instructions at: http://netevil.org/node.php?nid=202
 for more detail on this issue.
-          " >&2;}
-   { (exit 1); exit 1; }; }
+          " "$LINENO" 5
         ext_shared=no
         ;;
     esac
@@ -86857,30 +68574,18 @@ EOF
   is_it_shared=$PHP_SPL_SHARED
   is_it_enabled=$PHP_SPL
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension pdo to build statically, but it
 depends on extension spl, which you've configured to build shared.
 You either need to build pdo shared or build spl statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension pdo to build statically, but it
-depends on extension spl, which you've configured to build shared.
-You either need to build pdo shared or build spl statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo, which depends on extension spl,
-but you've either not enabled spl, or have disabled it.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension pdo, which depends on extension spl,
 but you've either not enabled spl, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 
@@ -86921,11 +68626,11 @@ fi
 
 php_with_pdo_dblib=no
 
-{ echo "$as_me:$LINENO: checking for PDO_DBLIB support via FreeTDS" >&5
-echo $ECHO_N "checking for PDO_DBLIB support via FreeTDS... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO_DBLIB support via FreeTDS" >&5
+$as_echo_n "checking for PDO_DBLIB support via FreeTDS... " >&6; }
 
 # Check whether --with-pdo-dblib was given.
-if test "${with_pdo_dblib+set}" = set; then
+if test "${with_pdo_dblib+set}" = set; then :
   withval=$with_pdo_dblib; PHP_PDO_DBLIB=$withval
 else
 
@@ -86957,8 +68662,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -86966,9 +68671,7 @@ echo "${ECHO_T}$ext_output" >&6; }
 if test "$PHP_PDO_DBLIB" != "no"; then
 
   if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-    { { echo "$as_me:$LINENO: error: PDO is not enabled! Add --enable-pdo to your configure line." >&5
-echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5
   fi
 
   if test "$PHP_PDO_DBLIB" = "yes"; then
@@ -86986,9 +68689,7 @@ echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line
     done
 
     if test -z "$PDO_FREETDS_INSTALLATION_DIR"; then
-      { { echo "$as_me:$LINENO: error: Cannot find FreeTDS in known installation directories" >&5
-echo "$as_me: error: Cannot find FreeTDS in known installation directories" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Cannot find FreeTDS in known installation directories" "$LINENO" 5
     fi
 
   elif test "$PHP_PDO_DBLIB" != "no"; then
@@ -87000,9 +68701,7 @@ echo "$as_me: error: Cannot find FreeTDS in known installation directories" >&2;
       PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
       PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds
     else
-      { { echo "$as_me:$LINENO: error: Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory" >&5
-echo "$as_me: error: Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory" "$LINENO" 5
     fi
   fi
 
@@ -87011,9 +68710,7 @@ echo "$as_me: error: Directory $PHP_PDO_DBLIB is not a FreeTDS installation dire
   fi
 
   if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
-     { { echo "$as_me:$LINENO: error: Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" >&5
-echo "$as_me: error: Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" >&2;}
-   { (exit 1); exit 1; }; }
+     as_fn_error "Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a|so" "$LINENO" 5
   fi
 
 
@@ -87023,10 +68720,10 @@ echo "$as_me: error: Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/li
     ai_p=$PDO_FREETDS_INCLUDE_DIR
   else
 
-    ep_dir="`echo $PDO_FREETDS_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PDO_FREETDS_INCLUDE_DIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PDO_FREETDS_INCLUDE_DIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PDO_FREETDS_INCLUDE_DIR"`
   fi
 
 
@@ -87059,10 +68756,10 @@ echo "$as_me: error: Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/li
     ai_p=$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -87102,10 +68799,10 @@ echo "$as_me: error: Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/li
     ai_p=$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -87147,14 +68844,14 @@ echo "$as_me: error: Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/li
 
 
 
-  { echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6; }
-if test "${pdo_cv_inc_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
+if test "${pdo_cv_inc_path+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    { echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$abs_srcdir/ext
     elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -87164,14 +68861,12 @@ echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6; }
     fi
 
 fi
-{ echo "$as_me:$LINENO: result: $pdo_cv_inc_path" >&5
-echo "${ECHO_T}$pdo_cv_inc_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
+$as_echo "$pdo_cv_inc_path" >&6; }
   if test -n "$pdo_cv_inc_path"; then
 :
   else
-{ { echo "$as_me:$LINENO: error: Cannot find php_pdo_driver.h." >&5
-echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;}
-   { (exit 1); exit 1; }; }
+as_fn_error "Cannot find php_pdo_driver.h." "$LINENO" 5
   fi
 
 
@@ -87470,18 +69165,14 @@ EOF
 
   fi
 
-  { echo "$as_me:$LINENO: checking for dnet_addr in -ldnet_stub" >&5
-echo $ECHO_N "checking for dnet_addr in -ldnet_stub... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dnet_stub_dnet_addr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_addr in -ldnet_stub" >&5
+$as_echo_n "checking for dnet_addr in -ldnet_stub... " >&6; }
+if test "${ac_cv_lib_dnet_stub_dnet_addr+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -87499,39 +69190,18 @@ return dnet_addr ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dnet_stub_dnet_addr=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dnet_stub_dnet_addr=no
+  ac_cv_lib_dnet_stub_dnet_addr=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_addr" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_addr" >&6; }
-if test $ac_cv_lib_dnet_stub_dnet_addr = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_addr" >&5
+$as_echo "$ac_cv_lib_dnet_stub_dnet_addr" >&6; }
+if test "x$ac_cv_lib_dnet_stub_dnet_addr" = x""yes; then :
 
 
   if test "$ext_shared" = "yes"; then
@@ -87544,10 +69214,10 @@ if test $ac_cv_lib_dnet_stub_dnet_addr = yes; then
     ai_p=
   else
 
-    ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo |$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename ""`
   fi
 
 
@@ -87587,10 +69257,10 @@ if test $ac_cv_lib_dnet_stub_dnet_addr = yes; then
     ai_p=
   else
 
-    ep_dir="`echo |$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo |$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename ""`
   fi
 
 
@@ -87630,22 +69300,16 @@ if test $ac_cv_lib_dnet_stub_dnet_addr = yes; then
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBDNET_STUB 1
-_ACEOF
+$as_echo "#define HAVE_LIBDNET_STUB 1" >>confdefs.h
 
 
 fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PDO_DBLIB 1
-_ACEOF
+$as_echo "#define HAVE_PDO_DBLIB 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FREETDS 1
-_ACEOF
+$as_echo "#define HAVE_FREETDS 1" >>confdefs.h
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_DBLIB_SHARED_LIBADD"
@@ -87657,30 +69321,18 @@ _ACEOF
   is_it_shared=$PHP_PDO_SHARED
   is_it_enabled=$PHP_PDO
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_dblib to build statically, but it
-depends on extension pdo, which you've configured to build shared.
-You either need to build pdo_dblib shared or build pdo statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension pdo_dblib to build statically, but it
 depends on extension pdo, which you've configured to build shared.
 You either need to build pdo_dblib shared or build pdo statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension pdo_dblib, which depends on extension pdo,
 but you've either not enabled pdo, or have disabled it.
-" >&5
-echo "$as_me: error:
-You've configured extension pdo_dblib, which depends on extension pdo,
-but you've either not enabled pdo, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 
@@ -87690,11 +69342,11 @@ fi
 
 php_with_pdo_firebird=no
 
-{ echo "$as_me:$LINENO: checking for Firebird support for PDO" >&5
-echo $ECHO_N "checking for Firebird support for PDO... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Firebird support for PDO" >&5
+$as_echo_n "checking for Firebird support for PDO... " >&6; }
 
 # Check whether --with-pdo-firebird was given.
-if test "${with_pdo_firebird+set}" = set; then
+if test "${with_pdo_firebird+set}" = set; then :
   withval=$with_pdo_firebird; PHP_PDO_FIREBIRD=$withval
 else
 
@@ -87726,8 +69378,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -87735,9 +69387,7 @@ echo "${ECHO_T}$ext_output" >&6; }
 if test "$PHP_PDO_FIREBIRD" != "no"; then
 
   if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-    { { echo "$as_me:$LINENO: error: PDO is not enabled! Add --enable-pdo to your configure line." >&5
-echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5
   fi
 
   if test "$PHP_PDO_FIREBIRD" = "yes"; then
@@ -87812,10 +69462,10 @@ echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -87847,18 +69497,14 @@ echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for isc_detach_database in -lfbclient" >&5
-echo $ECHO_N "checking for isc_detach_database in -lfbclient... $ECHO_C" >&6; }
-if test "${ac_cv_lib_fbclient_isc_detach_database+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lfbclient" >&5
+$as_echo_n "checking for isc_detach_database in -lfbclient... " >&6; }
+if test "${ac_cv_lib_fbclient_isc_detach_database+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfbclient  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -87876,39 +69522,18 @@ return isc_detach_database ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_fbclient_isc_detach_database=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_fbclient_isc_detach_database=no
+  ac_cv_lib_fbclient_isc_detach_database=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_fbclient_isc_detach_database" >&5
-echo "${ECHO_T}$ac_cv_lib_fbclient_isc_detach_database" >&6; }
-if test $ac_cv_lib_fbclient_isc_detach_database = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fbclient_isc_detach_database" >&5
+$as_echo "$ac_cv_lib_fbclient_isc_detach_database" >&6; }
+if test "x$ac_cv_lib_fbclient_isc_detach_database" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -87984,10 +69609,10 @@ else
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -88019,18 +69644,14 @@ else
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for isc_detach_database in -lgds" >&5
-echo $ECHO_N "checking for isc_detach_database in -lgds... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gds_isc_detach_database+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lgds" >&5
+$as_echo_n "checking for isc_detach_database in -lgds... " >&6; }
+if test "${ac_cv_lib_gds_isc_detach_database+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgds  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -88048,39 +69669,18 @@ return isc_detach_database ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gds_isc_detach_database=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_gds_isc_detach_database=no
+  ac_cv_lib_gds_isc_detach_database=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gds_isc_detach_database" >&5
-echo "${ECHO_T}$ac_cv_lib_gds_isc_detach_database" >&6; }
-if test $ac_cv_lib_gds_isc_detach_database = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gds_isc_detach_database" >&5
+$as_echo "$ac_cv_lib_gds_isc_detach_database" >&6; }
+if test "x$ac_cv_lib_gds_isc_detach_database" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -88156,10 +69756,10 @@ else
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -88191,18 +69791,14 @@ else
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for isc_detach_database in -lib_util" >&5
-echo $ECHO_N "checking for isc_detach_database in -lib_util... $ECHO_C" >&6; }
-if test "${ac_cv_lib_ib_util_isc_detach_database+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lib_util" >&5
+$as_echo_n "checking for isc_detach_database in -lib_util... " >&6; }
+if test "${ac_cv_lib_ib_util_isc_detach_database+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lib_util  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -88220,39 +69816,18 @@ return isc_detach_database ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ib_util_isc_detach_database=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_ib_util_isc_detach_database=no
+  ac_cv_lib_ib_util_isc_detach_database=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ib_util_isc_detach_database" >&5
-echo "${ECHO_T}$ac_cv_lib_ib_util_isc_detach_database" >&6; }
-if test $ac_cv_lib_ib_util_isc_detach_database = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ib_util_isc_detach_database" >&5
+$as_echo "$ac_cv_lib_ib_util_isc_detach_database" >&6; }
+if test "x$ac_cv_lib_ib_util_isc_detach_database" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -88266,9 +69841,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_ib_util_isc_detach_database
 
-        { { echo "$as_me:$LINENO: error: libfbclient, libgds or libib_util not found! Check config.log for more information." >&5
-echo "$as_me: error: libfbclient, libgds or libib_util not found! Check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error "libfbclient, libgds or libib_util not found! Check config.log for more information." "$LINENO" 5
 
 
 fi
@@ -88283,14 +69856,14 @@ fi
 
 
 
-  { echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6; }
-if test "${pdo_cv_inc_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
+if test "${pdo_cv_inc_path+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    { echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$abs_srcdir/ext
     elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -88300,14 +69873,12 @@ echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6; }
     fi
 
 fi
-{ echo "$as_me:$LINENO: result: $pdo_cv_inc_path" >&5
-echo "${ECHO_T}$pdo_cv_inc_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
+$as_echo "$pdo_cv_inc_path" >&6; }
   if test -n "$pdo_cv_inc_path"; then
 :
   else
-{ { echo "$as_me:$LINENO: error: Cannot find php_pdo_driver.h." >&5
-echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;}
-   { (exit 1); exit 1; }; }
+as_fn_error "Cannot find php_pdo_driver.h." "$LINENO" 5
   fi
 
 
@@ -88323,10 +69894,10 @@ echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;}
     ai_p=$FIREBIRD_LIBDIR
   else
 
-    ep_dir="`echo $FIREBIRD_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $FIREBIRD_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$FIREBIRD_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$FIREBIRD_LIBDIR"`
   fi
 
 
@@ -88366,10 +69937,10 @@ echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;}
     ai_p=$FIREBIRD_LIBDIR
   else
 
-    ep_dir="`echo $FIREBIRD_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $FIREBIRD_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$FIREBIRD_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$FIREBIRD_LIBDIR"`
   fi
 
 
@@ -88415,10 +69986,10 @@ echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;}
     ai_p=$FIREBIRD_INCDIR
   else
 
-    ep_dir="`echo $FIREBIRD_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $FIREBIRD_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$FIREBIRD_INCDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$FIREBIRD_INCDIR"`
   fi
 
 
@@ -88440,9 +70011,7 @@ echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;}
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PDO_FIREBIRD 1
-_ACEOF
+$as_echo "#define HAVE_PDO_FIREBIRD 1" >>confdefs.h
 
 
   ext_builddir=ext/pdo_firebird
@@ -88745,30 +70314,18 @@ EOF
   is_it_shared=$PHP_PDO_SHARED
   is_it_enabled=$PHP_PDO
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_firebird to build statically, but it
-depends on extension pdo, which you've configured to build shared.
-You either need to build pdo_firebird shared or build pdo statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension pdo_firebird to build statically, but it
 depends on extension pdo, which you've configured to build shared.
 You either need to build pdo_firebird shared or build pdo statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_firebird, which depends on extension pdo,
-but you've either not enabled pdo, or have disabled it.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension pdo_firebird, which depends on extension pdo,
 but you've either not enabled pdo, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 fi
@@ -88777,11 +70334,11 @@ fi
 
 php_with_pdo_mysql=no
 
-{ echo "$as_me:$LINENO: checking for MySQL support for PDO" >&5
-echo $ECHO_N "checking for MySQL support for PDO... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL support for PDO" >&5
+$as_echo_n "checking for MySQL support for PDO... " >&6; }
 
 # Check whether --with-pdo-mysql was given.
-if test "${with_pdo_mysql+set}" = set; then
+if test "${with_pdo_mysql+set}" = set; then :
   withval=$with_pdo_mysql; PHP_PDO_MYSQL=$withval
 else
 
@@ -88813,8 +70370,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -88823,11 +70380,11 @@ if test -z "$PHP_ZLIB_DIR"; then
 
 php_with_zlib_dir=no
 
-{ echo "$as_me:$LINENO: checking for the location of libz" >&5
-echo $ECHO_N "checking for the location of libz... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libz" >&5
+$as_echo_n "checking for the location of libz... " >&6; }
 
 # Check whether --with-zlib-dir was given.
-if test "${with_zlib_dir+set}" = set; then
+if test "${with_zlib_dir+set}" = set; then :
   withval=$with_zlib_dir; PHP_ZLIB_DIR=$withval
 else
 
@@ -88838,8 +70395,8 @@ fi
 
 
 ext_output=$PHP_ZLIB_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -88848,9 +70405,7 @@ fi
 if test "$PHP_PDO_MYSQL" != "no"; then
 
   if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-    { { echo "$as_me:$LINENO: error: PDO is not enabled! Add --enable-pdo to your configure line." >&5
-echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5
   fi
 
 
@@ -88872,29 +70427,25 @@ echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line
   if test "$PHP_PDO_MYSQL" = "yes" || test "$PHP_PDO_MYSQL" = "mysqlnd"; then
         PHP_MYSQLND_ENABLED=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define PDO_USE_MYSQLND 1
-_ACEOF
+$as_echo "#define PDO_USE_MYSQLND 1" >>confdefs.h
 
   else
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MYSQL 1
-_ACEOF
+$as_echo "#define HAVE_MYSQL 1" >>confdefs.h
 
 
-    { echo "$as_me:$LINENO: checking for mysql_config" >&5
-echo $ECHO_N "checking for mysql_config... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_config" >&5
+$as_echo_n "checking for mysql_config... " >&6; }
     if test -n "$PDO_MYSQL_CONFIG"; then
-      { echo "$as_me:$LINENO: result: $PDO_MYSQL_CONFIG" >&5
-echo "${ECHO_T}$PDO_MYSQL_CONFIG" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_MYSQL_CONFIG" >&5
+$as_echo "$PDO_MYSQL_CONFIG" >&6; }
       if test "x$SED" = "x"; then
         # Extract the first word of "sed", so it can be a program name with args.
 set dummy sed; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_SED+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $SED in
   [\\/]* | ?:[\\/]*)
@@ -88906,14 +70457,14 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -88921,11 +70472,11 @@ esac
 fi
 SED=$ac_cv_path_SED
 if test -n "$SED"; then
-  { echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
+$as_echo "$SED" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -88939,10 +70490,10 @@ fi
       fi
       PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
     elif test -n "$PDO_MYSQL_DIR"; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-      { echo "$as_me:$LINENO: checking for mysql install under $PDO_MYSQL_DIR" >&5
-echo $ECHO_N "checking for mysql install under $PDO_MYSQL_DIR... $ECHO_C" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql install under $PDO_MYSQL_DIR" >&5
+$as_echo_n "checking for mysql install under $PDO_MYSQL_DIR... " >&6; }
       if test -r $PDO_MYSQL_DIR/include/mysql; then
         PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include/mysql
       else
@@ -88955,14 +70506,12 @@ echo $ECHO_N "checking for mysql install under $PDO_MYSQL_DIR... $ECHO_C" >&6; }
       fi
 
       if test -r "$PDO_MYSQL_LIB_DIR"; then
-        { echo "$as_me:$LINENO: result: libs under $PDO_MYSQL_LIB_DIR; seems promising" >&5
-echo "${ECHO_T}libs under $PDO_MYSQL_LIB_DIR; seems promising" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: libs under $PDO_MYSQL_LIB_DIR; seems promising" >&5
+$as_echo "libs under $PDO_MYSQL_LIB_DIR; seems promising" >&6; }
       else
-        { echo "$as_me:$LINENO: result: can not find it" >&5
-echo "${ECHO_T}can not find it" >&6; }
-        { { echo "$as_me:$LINENO: error: Unable to find your mysql installation" >&5
-echo "$as_me: error: Unable to find your mysql installation" >&2;}
-   { (exit 1); exit 1; }; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: can not find it" >&5
+$as_echo "can not find it" >&6; }
+        as_fn_error "Unable to find your mysql installation" "$LINENO" 5
       fi
 
 
@@ -88972,10 +70521,10 @@ echo "$as_me: error: Unable to find your mysql installation" >&2;}
     ai_p=$PDO_MYSQL_INC_DIR
   else
 
-    ep_dir="`echo $PDO_MYSQL_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PDO_MYSQL_INC_DIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PDO_MYSQL_INC_DIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PDO_MYSQL_INC_DIR"`
   fi
 
 
@@ -88998,11 +70547,9 @@ echo "$as_me: error: Unable to find your mysql installation" >&2;}
 
       PDO_MYSQL_INCLUDE=-I$PDO_MYSQL_INC_DIR
     else
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-      { { echo "$as_me:$LINENO: error: Unable to find your mysql installation" >&5
-echo "$as_me: error: Unable to find your mysql installation" >&2;}
-   { (exit 1); exit 1; }; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+      as_fn_error "Unable to find your mysql installation" "$LINENO" 5
     fi
 
 
@@ -89067,10 +70614,10 @@ echo "$as_me: error: Unable to find your mysql installation" >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -89102,19 +70649,15 @@ echo "$as_me: error: Unable to find your mysql installation" >&2;}
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$PDO_MYSQL_LIBNAME''_mysql_commit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for mysql_commit in -l$PDO_MYSQL_LIBNAME" >&5
-echo $ECHO_N "checking for mysql_commit in -l$PDO_MYSQL_LIBNAME... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$PDO_MYSQL_LIBNAME''_mysql_commit" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_commit in -l$PDO_MYSQL_LIBNAME" >&5
+$as_echo_n "checking for mysql_commit in -l$PDO_MYSQL_LIBNAME... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$PDO_MYSQL_LIBNAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -89132,40 +70675,20 @@ return mysql_commit ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -89182,10 +70705,10 @@ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -89264,10 +70787,10 @@ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -89320,10 +70843,10 @@ else
     ai_p=$PHP_ZLIB_DIR
   else
 
-    ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_ZLIB_DIR"`
   fi
 
 
@@ -89363,10 +70886,10 @@ else
     ai_p=$PHP_ZLIB_DIR
   else
 
-    ep_dir="`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_ZLIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_ZLIB_DIR"`
   fi
 
 
@@ -89467,10 +70990,10 @@ else
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -89502,19 +71025,15 @@ else
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$PDO_MYSQL_LIBNAME''_mysql_commit" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for mysql_commit in -l$PDO_MYSQL_LIBNAME" >&5
-echo $ECHO_N "checking for mysql_commit in -l$PDO_MYSQL_LIBNAME... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$PDO_MYSQL_LIBNAME''_mysql_commit" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_commit in -l$PDO_MYSQL_LIBNAME" >&5
+$as_echo_n "checking for mysql_commit in -l$PDO_MYSQL_LIBNAME... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$PDO_MYSQL_LIBNAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -89532,40 +71051,20 @@ return mysql_commit ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -89577,9 +71076,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_commit
 
-          { { echo "$as_me:$LINENO: error: PDO_MYSQL configure failed, MySQL 4.1 needed. Please check config.log for more information." >&5
-echo "$as_me: error: PDO_MYSQL configure failed, MySQL 4.1 needed. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+          as_fn_error "PDO_MYSQL configure failed, MySQL 4.1 needed. Please check config.log for more information." "$LINENO" 5
 
 
 fi
@@ -89671,10 +71168,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -89706,19 +71203,15 @@ fi
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$PDO_MYSQL_LIBNAME''_mysql_query" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
-echo $ECHO_N "checking for mysql_query in -l$PDO_MYSQL_LIBNAME... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$PDO_MYSQL_LIBNAME''_mysql_query" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
+$as_echo_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$PDO_MYSQL_LIBNAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -89736,40 +71229,20 @@ return mysql_query ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -89781,9 +71254,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$PDO_MYSQL_LIBNAME_mysql_query
 
-          { { echo "$as_me:$LINENO: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." >&5
-echo "$as_me: error: Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+          as_fn_error "Try adding --with-zlib-dir=<DIR>. Please check config.log for more information." "$LINENO" 5
 
 
 fi
@@ -89803,10 +71274,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -89885,10 +71356,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -89928,14 +71399,14 @@ fi
 
 
 
-  { echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6; }
-if test "${pdo_cv_inc_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
+if test "${pdo_cv_inc_path+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    { echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$abs_srcdir/ext
     elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -89945,14 +71416,12 @@ echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6; }
     fi
 
 fi
-{ echo "$as_me:$LINENO: result: $pdo_cv_inc_path" >&5
-echo "${ECHO_T}$pdo_cv_inc_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
+$as_echo "$pdo_cv_inc_path" >&6; }
   if test -n "$pdo_cv_inc_path"; then
 :
   else
-{ { echo "$as_me:$LINENO: error: Cannot find php_pdo_driver.h." >&5
-echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;}
-   { (exit 1); exit 1; }; }
+as_fn_error "Cannot find php_pdo_driver.h." "$LINENO" 5
   fi
 
 
@@ -90265,30 +71734,18 @@ EOF
   is_it_shared=$PHP_PDO_SHARED
   is_it_enabled=$PHP_PDO
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_mysql to build statically, but it
-depends on extension pdo, which you've configured to build shared.
-You either need to build pdo_mysql shared or build pdo statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension pdo_mysql to build statically, but it
 depends on extension pdo, which you've configured to build shared.
 You either need to build pdo_mysql shared or build pdo statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension pdo_mysql, which depends on extension pdo,
 but you've either not enabled pdo, or have disabled it.
-" >&5
-echo "$as_me: error:
-You've configured extension pdo_mysql, which depends on extension pdo,
-but you've either not enabled pdo, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
     if test "$PHP_MYSQL" = "mysqlnd"; then
@@ -90297,30 +71754,18 @@ but you've either not enabled pdo, or have disabled it.
   is_it_shared=$PHP_MYSQLND_SHARED
   is_it_enabled=$PHP_MYSQLND
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension pdo_mysql to build statically, but it
 depends on extension mysqlnd, which you've configured to build shared.
 You either need to build pdo_mysql shared or build mysqlnd statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension pdo_mysql to build statically, but it
-depends on extension mysqlnd, which you've configured to build shared.
-You either need to build pdo_mysql shared or build mysqlnd statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension pdo_mysql, which depends on extension mysqlnd,
 but you've either not enabled mysqlnd, or have disabled it.
-" >&5
-echo "$as_me: error:
-You've configured extension pdo_mysql, which depends on extension mysqlnd,
-but you've either not enabled mysqlnd, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
     fi
@@ -90339,7 +71784,7 @@ but you've either not enabled mysqlnd, or have disabled it.
 fi
 
 
-SUPPORTED_LIB_VERS="9.0 10.1 11.1"  # This caters for all Oracle 9.x, 10.x and 11.1 installs
+SUPPORTED_LIB_VERS="9.0 10.1 11.1 12.1"  # The lib vers are not bumped when the DB version is bumped
 
 
 
@@ -90347,11 +71792,11 @@ SUPPORTED_LIB_VERS="9.0 10.1 11.1"  # This caters for all Oracle 9.x, 10.x and 1
 
 php_with_pdo_oci=no
 
-{ echo "$as_me:$LINENO: checking Oracle OCI support for PDO" >&5
-echo $ECHO_N "checking Oracle OCI support for PDO... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle OCI support for PDO" >&5
+$as_echo_n "checking Oracle OCI support for PDO... " >&6; }
 
 # Check whether --with-pdo-oci was given.
-if test "${with_pdo_oci+set}" = set; then
+if test "${with_pdo_oci+set}" = set; then :
   withval=$with_pdo_oci; PHP_PDO_OCI=$withval
 else
 
@@ -90383,8 +71828,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -90392,434 +71837,57 @@ echo "${ECHO_T}$ext_output" >&6; }
 if test "$PHP_PDO_OCI" != "no"; then
 
   if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-    { { echo "$as_me:$LINENO: error: PDO is not enabled! Add --enable-pdo to your configure line." >&5
-echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5
   fi
 
-  { echo "$as_me:$LINENO: checking Oracle Install-Dir" >&5
-echo $ECHO_N "checking Oracle Install-Dir... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle Install-Dir" >&5
+$as_echo_n "checking Oracle Install-Dir... " >&6; }
   if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then
     PDO_OCI_DIR=$ORACLE_HOME
   else
     PDO_OCI_DIR=$PHP_PDO_OCI
   fi
-  { echo "$as_me:$LINENO: result: $PHP_PDO_OCI" >&5
-echo "${ECHO_T}$PHP_PDO_OCI" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_PDO_OCI" >&5
+$as_echo "$PHP_PDO_OCI" >&6; }
 
-  { echo "$as_me:$LINENO: checking if that is sane" >&5
-echo $ECHO_N "checking if that is sane... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if that is sane" >&5
+$as_echo_n "checking if that is sane... " >&6; }
   if test -z "$PDO_OCI_DIR"; then
-    { { echo "$as_me:$LINENO: error:
-You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   else
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   fi
 
   if test "instantclient" = "`echo $PDO_OCI_DIR | cut -d, -f1`" ; then
-    { echo "$as_me:$LINENO: checking for long int" >&5
-echo $ECHO_N "checking for long int... $ECHO_C" >&6; }
-if test "${ac_cv_type_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long int ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_long_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_int" >&5
-echo "${ECHO_T}$ac_cv_type_long_int" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
+    # 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.
-{ echo "$as_me:$LINENO: checking size of long int" >&5
-echo $ECHO_N "checking size of long int... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long int" >&5
+$as_echo_n "checking size of long int... " >&6; }
+if test "${ac_cv_sizeof_long_int+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long int))" "ac_cv_sizeof_long_int"        "$ac_includes_default"; then :
 
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_int=$ac_lo;;
-'') if test "$ac_cv_type_long_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_int=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_long_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_long_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long int)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_long_int=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_int" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_int" >&5
+$as_echo "$ac_cv_sizeof_long_int" >&6; }
 
 
 
@@ -90842,8 +71910,8 @@ _ACEOF
         PDO_OCI_IC_VERS="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`"
       fi
     fi
-    { echo "$as_me:$LINENO: checking for oci.h" >&5
-echo $ECHO_N "checking for oci.h... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for oci.h" >&5
+$as_echo_n "checking for oci.h... " >&6; }
     if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/oci.h ; then
 
   if test "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" != "/usr/include"; then
@@ -90852,10 +71920,10 @@ echo $ECHO_N "checking for oci.h... $ECHO_C" >&6; }
     ai_p=$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR
   else
 
-    ep_dir="`echo $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR"`
   fi
 
 
@@ -90876,8 +71944,8 @@ echo $ECHO_N "checking for oci.h... $ECHO_C" >&6; }
 
   fi
 
-      { echo "$as_me:$LINENO: result: $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" >&5
-echo "${ECHO_T}$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" >&5
+$as_echo "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" >&6; }
     elif test -f $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include/oci.h ; then
 
   if test "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include" != "/usr/include"; then
@@ -90886,10 +71954,10 @@ echo "${ECHO_T}$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIEN
     ai_p=$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include
   else
 
-    ep_dir="`echo $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include"`
   fi
 
 
@@ -90910,8 +71978,8 @@ echo "${ECHO_T}$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIEN
 
   fi
 
-      { echo "$as_me:$LINENO: result: $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include" >&5
-echo "${ECHO_T}$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include" >&5
+$as_echo "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/include" >&6; }
     elif test -f $PDO_OCI_IC_PREFIX/sdk/include/oci.h ; then
 
   if test "$PDO_OCI_IC_PREFIX/sdk/include" != "/usr/include"; then
@@ -90920,10 +71988,10 @@ echo "${ECHO_T}$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DI
     ai_p=$PDO_OCI_IC_PREFIX/sdk/include
   else
 
-    ep_dir="`echo $PDO_OCI_IC_PREFIX/sdk/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PDO_OCI_IC_PREFIX/sdk/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/sdk/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PDO_OCI_IC_PREFIX/sdk/include"`
   fi
 
 
@@ -90944,8 +72012,8 @@ echo "${ECHO_T}$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DI
 
   fi
 
-      { echo "$as_me:$LINENO: result: $PDO_OCI_IC_PREFIX/sdk/include" >&5
-echo "${ECHO_T}$PDO_OCI_IC_PREFIX/sdk/include" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_IC_PREFIX/sdk/include" >&5
+$as_echo "$PDO_OCI_IC_PREFIX/sdk/include" >&6; }
     elif test -f $PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include/oci.h ; then
 
   if test "$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include" != "/usr/include"; then
@@ -90954,10 +72022,10 @@ echo "${ECHO_T}$PDO_OCI_IC_PREFIX/sdk/include" >&6; }
     ai_p=$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include
   else
 
-    ep_dir="`echo $PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include"`
   fi
 
 
@@ -90978,12 +72046,10 @@ echo "${ECHO_T}$PDO_OCI_IC_PREFIX/sdk/include" >&6; }
 
   fi
 
-      { echo "$as_me:$LINENO: result: $PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include" >&5
-echo "${ECHO_T}$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include" >&5
+$as_echo "$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include" >&6; }
     else
-      { { echo "$as_me:$LINENO: error: I'm too dumb to figure out where the include dir is in your Instant Client install" >&5
-echo "$as_me: error: I'm too dumb to figure out where the include dir is in your Instant Client install" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "I'm too dumb to figure out where the include dir is in your Instant Client install" "$LINENO" 5
     fi
     if test -f "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME" ; then
     PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/lib"
@@ -90992,410 +72058,37 @@ echo "$as_me: error: I'm too dumb to figure out where the include dir is in your
     elif test -f "$PDO_OCI_IC_PREFIX/libclntsh.$SHLIB_SUFFIX_NAME" ; then
       PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX"
     else
-      { { echo "$as_me:$LINENO: error: I'm too dumb to figure out where the libraries are in your Instant Client install" >&5
-echo "$as_me: error: I'm too dumb to figure out where the libraries are in your Instant Client install" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "I'm too dumb to figure out where the libraries are in your Instant Client install" "$LINENO" 5
     fi
     PDO_OCI_VERSION="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`"
   else
 
-  { echo "$as_me:$LINENO: checking for long int" >&5
-echo $ECHO_N "checking for long int... $ECHO_C" >&6; }
-if test "${ac_cv_type_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long int ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_long_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_int" >&5
-echo "${ECHO_T}$ac_cv_type_long_int" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
+  # 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.
-{ echo "$as_me:$LINENO: checking size of long int" >&5
-echo $ECHO_N "checking size of long int... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long int" >&5
+$as_echo_n "checking size of long int... " >&6; }
+if test "${ac_cv_sizeof_long_int+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long int))" "ac_cv_sizeof_long_int"        "$ac_includes_default"; then :
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_int=$ac_lo;;
-'') if test "$ac_cv_type_long_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_int=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_long_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_long_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long int)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_long_int=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_int" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_int" >&5
+$as_echo "$ac_cv_sizeof_long_int" >&6; }
 
 
 
@@ -91404,20 +72097,20 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-  { echo "$as_me:$LINENO: checking if we're on a 64-bit platform" >&5
-echo $ECHO_N "checking if we're on a 64-bit platform... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're on a 64-bit platform" >&5
+$as_echo_n "checking if we're on a 64-bit platform... " >&6; }
   if test "$ac_cv_sizeof_long_int" = "4" ; then
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32"
   else
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib"
   fi
 
-  { echo "$as_me:$LINENO: checking OCI8 libraries dir" >&5
-echo $ECHO_N "checking OCI8 libraries dir... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking OCI8 libraries dir" >&5
+$as_echo_n "checking OCI8 libraries dir... " >&6; }
   if test -d "$PDO_OCI_DIR/lib" && test ! -d "$PDO_OCI_DIR/lib32"; then
     PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib"
   elif test ! -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then
@@ -91425,12 +72118,10 @@ echo $ECHO_N "checking OCI8 libraries dir... $ECHO_C" >&6; }
   elif test -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then
     PDO_OCI_LIB_DIR=$TMP_PDO_OCI_LIB_DIR
   else
-    { { echo "$as_me:$LINENO: error: Oracle required OCI8 libraries not found" >&5
-echo "$as_me: error: Oracle required OCI8 libraries not found" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Oracle required OCI8 libraries not found" "$LINENO" 5
   fi
-  { echo "$as_me:$LINENO: result: $PDO_OCI_LIB_DIR" >&5
-echo "${ECHO_T}$PDO_OCI_LIB_DIR" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_LIB_DIR" >&5
+$as_echo "$PDO_OCI_LIB_DIR" >&6; }
 
 
     if test -d "$PDO_OCI_DIR/rdbms/public"; then
@@ -91441,10 +72132,10 @@ echo "${ECHO_T}$PDO_OCI_LIB_DIR" >&6; }
     ai_p=$PDO_OCI_DIR/rdbms/public
   else
 
-    ep_dir="`echo $PDO_OCI_DIR/rdbms/public|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PDO_OCI_DIR/rdbms/public|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/rdbms/public\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PDO_OCI_DIR/rdbms/public"`
   fi
 
 
@@ -91475,10 +72166,10 @@ echo "${ECHO_T}$PDO_OCI_LIB_DIR" >&6; }
     ai_p=$PDO_OCI_DIR/rdbms/demo
   else
 
-    ep_dir="`echo $PDO_OCI_DIR/rdbms/demo|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PDO_OCI_DIR/rdbms/demo|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/rdbms/demo\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PDO_OCI_DIR/rdbms/demo"`
   fi
 
 
@@ -91509,10 +72200,10 @@ echo "${ECHO_T}$PDO_OCI_LIB_DIR" >&6; }
     ai_p=$PDO_OCI_DIR/network/public
   else
 
-    ep_dir="`echo $PDO_OCI_DIR/network/public|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PDO_OCI_DIR/network/public|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/network/public\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PDO_OCI_DIR/network/public"`
   fi
 
 
@@ -91543,10 +72234,10 @@ echo "${ECHO_T}$PDO_OCI_LIB_DIR" >&6; }
     ai_p=$PDO_OCI_DIR/plsql/public
   else
 
-    ep_dir="`echo $PDO_OCI_DIR/plsql/public|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PDO_OCI_DIR/plsql/public|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/plsql/public\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PDO_OCI_DIR/plsql/public"`
   fi
 
 
@@ -91577,10 +72268,10 @@ echo "${ECHO_T}$PDO_OCI_LIB_DIR" >&6; }
     ai_p=$PDO_OCI_DIR/include
   else
 
-    ep_dir="`echo $PDO_OCI_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PDO_OCI_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PDO_OCI_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PDO_OCI_DIR/include"`
   fi
 
 
@@ -91659,10 +72350,10 @@ echo "${ECHO_T}$PDO_OCI_LIB_DIR" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -91749,10 +72440,10 @@ echo "${ECHO_T}$PDO_OCI_LIB_DIR" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -91786,25 +72477,23 @@ echo "${ECHO_T}$PDO_OCI_LIB_DIR" >&6; }
 
     fi
 
-  { echo "$as_me:$LINENO: checking Oracle version" >&5
-echo $ECHO_N "checking Oracle version... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle version" >&5
+$as_echo_n "checking Oracle version... " >&6; }
   for OCI_VER in $SUPPORTED_LIB_VERS; do
     if test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then
       PDO_OCI_VERSION="$OCI_VER"
     fi
   done
   if test -z "$PDO_OCI_VERSION"; then
-    { { echo "$as_me:$LINENO: error: Oracle required OCI8 libraries not found under $PDO_OCI_DIR" >&5
-echo "$as_me: error: Oracle required OCI8 libraries not found under $PDO_OCI_DIR" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Oracle required OCI8 libraries not found under $PDO_OCI_DIR" "$LINENO" 5
   fi
-  { echo "$as_me:$LINENO: result: $PDO_OCI_VERSION" >&5
-echo "${ECHO_T}$PDO_OCI_VERSION" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_VERSION" >&5
+$as_echo "$PDO_OCI_VERSION" >&6; }
 
   fi
 
   case $PDO_OCI_VERSION in
-    9.0|10.1|10.2|11.1|11.2)
+    9.0|10.1|10.2|11.1|11.2|12.1)
 
 
   case clntsh in
@@ -91831,9 +72520,7 @@ echo "${ECHO_T}$PDO_OCI_VERSION" >&6; }
       ;;
 
     *)
-      { { echo "$as_me:$LINENO: error: Unsupported Oracle version $PDO_OCI_VERSION" >&5
-echo "$as_me: error: Unsupported Oracle version $PDO_OCI_VERSION" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Unsupported Oracle version $PDO_OCI_VERSION" "$LINENO" 5
       ;;
   esac
 
@@ -91844,10 +72531,10 @@ echo "$as_me: error: Unsupported Oracle version $PDO_OCI_VERSION" >&2;}
     ai_p=$PDO_OCI_LIB_DIR
   else
 
-    ep_dir="`echo $PDO_OCI_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PDO_OCI_LIB_DIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PDO_OCI_LIB_DIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PDO_OCI_LIB_DIR"`
   fi
 
 
@@ -91938,10 +72625,10 @@ echo "$as_me: error: Unsupported Oracle version $PDO_OCI_VERSION" >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -91973,18 +72660,14 @@ echo "$as_me: error: Unsupported Oracle version $PDO_OCI_VERSION" >&2;}
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for OCIEnvCreate in -lclntsh" >&5
-echo $ECHO_N "checking for OCIEnvCreate in -lclntsh... $ECHO_C" >&6; }
-if test "${ac_cv_lib_clntsh_OCIEnvCreate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIEnvCreate in -lclntsh" >&5
+$as_echo_n "checking for OCIEnvCreate in -lclntsh... " >&6; }
+if test "${ac_cv_lib_clntsh_OCIEnvCreate+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lclntsh  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -92002,47 +72685,24 @@ return OCIEnvCreate ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_clntsh_OCIEnvCreate=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_clntsh_OCIEnvCreate=no
+  ac_cv_lib_clntsh_OCIEnvCreate=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCIEnvCreate" >&5
-echo "${ECHO_T}$ac_cv_lib_clntsh_OCIEnvCreate" >&6; }
-if test $ac_cv_lib_clntsh_OCIEnvCreate = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIEnvCreate" >&5
+$as_echo "$ac_cv_lib_clntsh_OCIEnvCreate" >&6; }
+if test "x$ac_cv_lib_clntsh_OCIEnvCreate" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OCIENVCREATE 1
-_ACEOF
+$as_echo "#define HAVE_OCIENVCREATE 1" >>confdefs.h
 
 
 
@@ -92118,10 +72778,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -92153,18 +72813,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for OCIEnvNlsCreate in -lclntsh" >&5
-echo $ECHO_N "checking for OCIEnvNlsCreate in -lclntsh... $ECHO_C" >&6; }
-if test "${ac_cv_lib_clntsh_OCIEnvNlsCreate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIEnvNlsCreate in -lclntsh" >&5
+$as_echo_n "checking for OCIEnvNlsCreate in -lclntsh... " >&6; }
+if test "${ac_cv_lib_clntsh_OCIEnvNlsCreate+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lclntsh  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -92182,47 +72838,24 @@ return OCIEnvNlsCreate ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_clntsh_OCIEnvNlsCreate=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_clntsh_OCIEnvNlsCreate=no
+  ac_cv_lib_clntsh_OCIEnvNlsCreate=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCIEnvNlsCreate" >&5
-echo "${ECHO_T}$ac_cv_lib_clntsh_OCIEnvNlsCreate" >&6; }
-if test $ac_cv_lib_clntsh_OCIEnvNlsCreate = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIEnvNlsCreate" >&5
+$as_echo "$ac_cv_lib_clntsh_OCIEnvNlsCreate" >&6; }
+if test "x$ac_cv_lib_clntsh_OCIEnvNlsCreate" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OCIENVNLSCREATE 1
-_ACEOF
+$as_echo "#define HAVE_OCIENVNLSCREATE 1" >>confdefs.h
 
 
 
@@ -92298,10 +72931,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -92333,18 +72966,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for OCILobIsTemporary in -lclntsh" >&5
-echo $ECHO_N "checking for OCILobIsTemporary in -lclntsh... $ECHO_C" >&6; }
-if test "${ac_cv_lib_clntsh_OCILobIsTemporary+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCILobIsTemporary in -lclntsh" >&5
+$as_echo_n "checking for OCILobIsTemporary in -lclntsh... " >&6; }
+if test "${ac_cv_lib_clntsh_OCILobIsTemporary+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lclntsh  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -92362,47 +72991,24 @@ return OCILobIsTemporary ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_clntsh_OCILobIsTemporary=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_clntsh_OCILobIsTemporary=no
+  ac_cv_lib_clntsh_OCILobIsTemporary=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCILobIsTemporary" >&5
-echo "${ECHO_T}$ac_cv_lib_clntsh_OCILobIsTemporary" >&6; }
-if test $ac_cv_lib_clntsh_OCILobIsTemporary = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCILobIsTemporary" >&5
+$as_echo "$ac_cv_lib_clntsh_OCILobIsTemporary" >&6; }
+if test "x$ac_cv_lib_clntsh_OCILobIsTemporary" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OCILOBISTEMPORARY 1
-_ACEOF
+$as_echo "#define HAVE_OCILOBISTEMPORARY 1" >>confdefs.h
 
 
 
@@ -92474,10 +73080,10 @@ else
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -92509,18 +73115,14 @@ else
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for OCILobIsTemporary in -locijdbc8" >&5
-echo $ECHO_N "checking for OCILobIsTemporary in -locijdbc8... $ECHO_C" >&6; }
-if test "${ac_cv_lib_ocijdbc8_OCILobIsTemporary+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCILobIsTemporary in -locijdbc8" >&5
+$as_echo_n "checking for OCILobIsTemporary in -locijdbc8... " >&6; }
+if test "${ac_cv_lib_ocijdbc8_OCILobIsTemporary+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-locijdbc8  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -92538,39 +73140,18 @@ return OCILobIsTemporary ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ocijdbc8_OCILobIsTemporary=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_ocijdbc8_OCILobIsTemporary=no
+  ac_cv_lib_ocijdbc8_OCILobIsTemporary=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ocijdbc8_OCILobIsTemporary" >&5
-echo "${ECHO_T}$ac_cv_lib_ocijdbc8_OCILobIsTemporary" >&6; }
-if test $ac_cv_lib_ocijdbc8_OCILobIsTemporary = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ocijdbc8_OCILobIsTemporary" >&5
+$as_echo "$ac_cv_lib_ocijdbc8_OCILobIsTemporary" >&6; }
+if test "x$ac_cv_lib_ocijdbc8_OCILobIsTemporary" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -92599,9 +73180,7 @@ if test $ac_cv_lib_ocijdbc8_OCILobIsTemporary = yes; then
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OCILOBISTEMPORARY 1
-_ACEOF
+$as_echo "#define HAVE_OCILOBISTEMPORARY 1" >>confdefs.h
 
 
 
@@ -92681,10 +73260,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -92716,18 +73295,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for OCICollAssign in -lclntsh" >&5
-echo $ECHO_N "checking for OCICollAssign in -lclntsh... $ECHO_C" >&6; }
-if test "${ac_cv_lib_clntsh_OCICollAssign+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCICollAssign in -lclntsh" >&5
+$as_echo_n "checking for OCICollAssign in -lclntsh... " >&6; }
+if test "${ac_cv_lib_clntsh_OCICollAssign+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lclntsh  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -92745,47 +73320,24 @@ return OCICollAssign ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_clntsh_OCICollAssign=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_clntsh_OCICollAssign=no
+  ac_cv_lib_clntsh_OCICollAssign=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCICollAssign" >&5
-echo "${ECHO_T}$ac_cv_lib_clntsh_OCICollAssign" >&6; }
-if test $ac_cv_lib_clntsh_OCICollAssign = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCICollAssign" >&5
+$as_echo "$ac_cv_lib_clntsh_OCICollAssign" >&6; }
+if test "x$ac_cv_lib_clntsh_OCICollAssign" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OCICOLLASSIGN 1
-_ACEOF
+$as_echo "#define HAVE_OCICOLLASSIGN 1" >>confdefs.h
 
 
 
@@ -92861,10 +73413,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -92896,18 +73448,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for OCIStmtFetch2 in -lclntsh" >&5
-echo $ECHO_N "checking for OCIStmtFetch2 in -lclntsh... $ECHO_C" >&6; }
-if test "${ac_cv_lib_clntsh_OCIStmtFetch2+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIStmtFetch2 in -lclntsh" >&5
+$as_echo_n "checking for OCIStmtFetch2 in -lclntsh... " >&6; }
+if test "${ac_cv_lib_clntsh_OCIStmtFetch2+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lclntsh  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -92925,47 +73473,24 @@ return OCIStmtFetch2 ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_clntsh_OCIStmtFetch2=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_clntsh_OCIStmtFetch2=no
+  ac_cv_lib_clntsh_OCIStmtFetch2=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_clntsh_OCIStmtFetch2" >&5
-echo "${ECHO_T}$ac_cv_lib_clntsh_OCIStmtFetch2" >&6; }
-if test $ac_cv_lib_clntsh_OCIStmtFetch2 = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIStmtFetch2" >&5
+$as_echo "$ac_cv_lib_clntsh_OCIStmtFetch2" >&6; }
+if test "x$ac_cv_lib_clntsh_OCIStmtFetch2" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_OCISTMTFETCH2 1
-_ACEOF
+$as_echo "#define HAVE_OCISTMTFETCH2 1" >>confdefs.h
 
 
 
@@ -92981,14 +73506,14 @@ fi
 
 
 
-  { echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6; }
-if test "${pdo_cv_inc_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
+if test "${pdo_cv_inc_path+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    { echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$abs_srcdir/ext
     elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -92998,14 +73523,12 @@ echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6; }
     fi
 
 fi
-{ echo "$as_me:$LINENO: result: $pdo_cv_inc_path" >&5
-echo "${ECHO_T}$pdo_cv_inc_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
+$as_echo "$pdo_cv_inc_path" >&6; }
   if test -n "$pdo_cv_inc_path"; then
 :
   else
-{ { echo "$as_me:$LINENO: error: Cannot find php_pdo_driver.h." >&5
-echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;}
-   { (exit 1); exit 1; }; }
+as_fn_error "Cannot find php_pdo_driver.h." "$LINENO" 5
   fi
 
 
@@ -93329,30 +73852,18 @@ EOF
   is_it_shared=$PHP_PDO_SHARED
   is_it_enabled=$PHP_PDO
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension pdo_oci to build statically, but it
 depends on extension pdo, which you've configured to build shared.
 You either need to build pdo_oci shared or build pdo statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension pdo_oci to build statically, but it
-depends on extension pdo, which you've configured to build shared.
-You either need to build pdo_oci shared or build pdo statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_oci, which depends on extension pdo,
-but you've either not enabled pdo, or have disabled it.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension pdo_oci, which depends on extension pdo,
 but you've either not enabled pdo, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 
@@ -93371,11 +73882,11 @@ fi
 
 php_with_pdo_odbc=no
 
-{ echo "$as_me:$LINENO: checking for ODBC v3 support for PDO" >&5
-echo $ECHO_N "checking for ODBC v3 support for PDO... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ODBC v3 support for PDO" >&5
+$as_echo_n "checking for ODBC v3 support for PDO... " >&6; }
 
 # Check whether --with-pdo-odbc was given.
-if test "${with_pdo_odbc+set}" = set; then
+if test "${with_pdo_odbc+set}" = set; then :
   withval=$with_pdo_odbc; PHP_PDO_ODBC=$withval
 else
 
@@ -93407,8 +73918,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -93419,21 +73930,19 @@ echo "${ECHO_T}$ext_output" >&6; }
 if test "$PHP_PDO_ODBC" != "no"; then
 
   if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-    { { echo "$as_me:$LINENO: error: PDO is not enabled! Add --enable-pdo to your configure line." >&5
-echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5
   fi
 
 
 
-  { echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6; }
-if test "${pdo_cv_inc_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
+if test "${pdo_cv_inc_path+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    { echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$abs_srcdir/ext
     elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -93443,20 +73952,18 @@ echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6; }
     fi
 
 fi
-{ echo "$as_me:$LINENO: result: $pdo_cv_inc_path" >&5
-echo "${ECHO_T}$pdo_cv_inc_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
+$as_echo "$pdo_cv_inc_path" >&6; }
   if test -n "$pdo_cv_inc_path"; then
 :
   else
-{ { echo "$as_me:$LINENO: error: Cannot find php_pdo_driver.h." >&5
-echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;}
-   { (exit 1); exit 1; }; }
+as_fn_error "Cannot find php_pdo_driver.h." "$LINENO" 5
   fi
 
 
 
-  { echo "$as_me:$LINENO: checking for selected PDO ODBC flavour" >&5
-echo $ECHO_N "checking for selected PDO ODBC flavour... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for selected PDO ODBC flavour" >&5
+$as_echo_n "checking for selected PDO ODBC flavour... " >&6; }
 
   pdo_odbc_flavour="`echo $PHP_PDO_ODBC | cut -d, -f1`"
   pdo_odbc_dir="`echo $PHP_PDO_ODBC | cut -d, -f2`"
@@ -93498,7 +74005,7 @@ echo $ECHO_N "checking for selected PDO ODBC flavour... $ECHO_C" >&6; }
         ;;
 
       *)
-        { { echo "$as_me:$LINENO: error: Unknown ODBC flavour $pdo_odbc_flavour
+        as_fn_error "Unknown ODBC flavour $pdo_odbc_flavour
                             include and lib dirs are looked for under 'dir'.
 
                             'flavour' can be one of:  ibm-db2, iODBC, unixODBC, generic
@@ -93513,24 +74020,7 @@ echo $ECHO_N "checking for selected PDO ODBC flavour... $ECHO_C" >&6; }
 
                               --with-pdo-odbc=generic,dir,libname,ldflags,cflags
 
-                            When build as shared the extension filename is always pdo_odbc.so" >&5
-echo "$as_me: error: Unknown ODBC flavour $pdo_odbc_flavour
-                            include and lib dirs are looked for under 'dir'.
-
-                            'flavour' can be one of:  ibm-db2, iODBC, unixODBC, generic
-                            If ',dir' part is omitted, default for the flavour
-                            you have selected will used. e.g.:
-
-                              --with-pdo-odbc=unixODBC
-
-                            will check for unixODBC under /usr/local. You may attempt
-                            to use an otherwise unsupported driver using the \"generic\"
-                            flavour.  The syntax for generic ODBC support is:
-
-                              --with-pdo-odbc=generic,dir,libname,ldflags,cflags
-
-                            When build as shared the extension filename is always pdo_odbc.so" >&2;}
-   { (exit 1); exit 1; }; }
+                            When build as shared the extension filename is always pdo_odbc.so" "$LINENO" 5
         ;;
   esac
 
@@ -93542,329 +74032,291 @@ echo "$as_me: error: Unknown ODBC flavour $pdo_odbc_flavour
     PDO_ODBC_LIBDIR="$pdo_odbc_def_libdir"
   fi
 
-  { echo "$as_me:$LINENO: result: $pdo_odbc_flavour
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_odbc_flavour
           libs       $PDO_ODBC_LIBDIR,
           headers    $PDO_ODBC_INCDIR" >&5
-echo "${ECHO_T}$pdo_odbc_flavour
+$as_echo "$pdo_odbc_flavour
           libs       $PDO_ODBC_LIBDIR,
           headers    $PDO_ODBC_INCDIR" >&6; }
 
   if test ! -d "$PDO_ODBC_LIBDIR" ; then
-    { echo "$as_me:$LINENO: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&5
-echo "$as_me: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&5
+$as_echo "$as_me: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&2;}
   fi
 
 
-  { echo "$as_me:$LINENO: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for odbc.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for odbc.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/odbc.h"; then
     php_pdo_have_header=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ODBC_H 1
-_ACEOF
+$as_echo "#define HAVE_ODBC_H 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { echo "$as_me:$LINENO: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for odbcsdk.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for odbcsdk.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/odbcsdk.h"; then
     php_pdo_have_header=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ODBCSDK_H 1
-_ACEOF
+$as_echo "#define HAVE_ODBCSDK_H 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { echo "$as_me:$LINENO: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for iodbc.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for iodbc.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/iodbc.h"; then
     php_pdo_have_header=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IODBC_H 1
-_ACEOF
+$as_echo "#define HAVE_IODBC_H 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { echo "$as_me:$LINENO: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for sqlunix.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for sqlunix.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/sqlunix.h"; then
     php_pdo_have_header=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SQLUNIX_H 1
-_ACEOF
+$as_echo "#define HAVE_SQLUNIX_H 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { echo "$as_me:$LINENO: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for sqltypes.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for sqltypes.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/sqltypes.h"; then
     php_pdo_have_header=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SQLTYPES_H 1
-_ACEOF
+$as_echo "#define HAVE_SQLTYPES_H 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { echo "$as_me:$LINENO: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for sqlucode.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for sqlucode.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/sqlucode.h"; then
     php_pdo_have_header=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SQLUCODE_H 1
-_ACEOF
+$as_echo "#define HAVE_SQLUCODE_H 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { echo "$as_me:$LINENO: checking for sql.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for sql.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sql.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for sql.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/sql.h"; then
     php_pdo_have_header=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SQL_H 1
-_ACEOF
+$as_echo "#define HAVE_SQL_H 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { echo "$as_me:$LINENO: checking for isql.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for isql.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isql.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for isql.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/isql.h"; then
     php_pdo_have_header=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ISQL_H 1
-_ACEOF
+$as_echo "#define HAVE_ISQL_H 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { echo "$as_me:$LINENO: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for sqlext.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for sqlext.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/sqlext.h"; then
     php_pdo_have_header=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SQLEXT_H 1
-_ACEOF
+$as_echo "#define HAVE_SQLEXT_H 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { echo "$as_me:$LINENO: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for isqlext.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for isqlext.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/isqlext.h"; then
     php_pdo_have_header=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ISQLEXT_H 1
-_ACEOF
+$as_echo "#define HAVE_ISQLEXT_H 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { echo "$as_me:$LINENO: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for udbcext.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for udbcext.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/udbcext.h"; then
     php_pdo_have_header=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UDBCEXT_H 1
-_ACEOF
+$as_echo "#define HAVE_UDBCEXT_H 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { echo "$as_me:$LINENO: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for sqlcli1.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for sqlcli1.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/sqlcli1.h"; then
     php_pdo_have_header=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SQLCLI1_H 1
-_ACEOF
+$as_echo "#define HAVE_SQLCLI1_H 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { echo "$as_me:$LINENO: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for LibraryManager.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for LibraryManager.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/LibraryManager.h"; then
     php_pdo_have_header=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBRARYMANAGER_H 1
-_ACEOF
+$as_echo "#define HAVE_LIBRARYMANAGER_H 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { echo "$as_me:$LINENO: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for cli0core.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for cli0core.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/cli0core.h"; then
     php_pdo_have_header=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CLI0CORE_H 1
-_ACEOF
+$as_echo "#define HAVE_CLI0CORE_H 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { echo "$as_me:$LINENO: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for cli0ext.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for cli0ext.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/cli0ext.h"; then
     php_pdo_have_header=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CLI0EXT_H 1
-_ACEOF
+$as_echo "#define HAVE_CLI0EXT_H 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { echo "$as_me:$LINENO: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for cli0cli.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for cli0cli.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/cli0cli.h"; then
     php_pdo_have_header=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CLI0CLI_H 1
-_ACEOF
+$as_echo "#define HAVE_CLI0CLI_H 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { echo "$as_me:$LINENO: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for cli0defs.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for cli0defs.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/cli0defs.h"; then
     php_pdo_have_header=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CLI0DEFS_H 1
-_ACEOF
+$as_echo "#define HAVE_CLI0DEFS_H 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { echo "$as_me:$LINENO: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
-echo $ECHO_N "checking for cli0env.h in $PDO_ODBC_INCDIR... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
+$as_echo_n "checking for cli0env.h in $PDO_ODBC_INCDIR... " >&6; }
   if test -f "$PDO_ODBC_INCDIR/cli0env.h"; then
     php_pdo_have_header=yes
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CLI0ENV_H 1
-_ACEOF
+$as_echo "#define HAVE_CLI0ENV_H 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
   if test "$php_pdo_have_header" != "yes"; then
-    { { echo "$as_me:$LINENO: error: Cannot find header file(s) for pdo_odbc" >&5
-echo "$as_me: error: Cannot find header file(s) for pdo_odbc" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Cannot find header file(s) for pdo_odbc" "$LINENO" 5
   fi
 
   PDO_ODBC_INCLUDE="$pdo_odbc_def_cflags -I$PDO_ODBC_INCDIR -DPDO_ODBC_TYPE=\\\"$pdo_odbc_flavour\\\""
@@ -93924,10 +74376,10 @@ echo "$as_me: error: Cannot find header file(s) for pdo_odbc" >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -94020,10 +74472,10 @@ echo "$as_me: error: Cannot find header file(s) for pdo_odbc" >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -94055,19 +74507,15 @@ echo "$as_me: error: Cannot find header file(s) for pdo_odbc" >&2;}
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$pdo_odbc_def_lib''_SQLBindCol" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
-echo $ECHO_N "checking for SQLBindCol in -l$pdo_odbc_def_lib... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$pdo_odbc_def_lib''_SQLBindCol" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
+$as_echo_n "checking for SQLBindCol in -l$pdo_odbc_def_lib... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$pdo_odbc_def_lib  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -94085,40 +74533,20 @@ return SQLBindCol ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -94183,10 +74611,10 @@ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -94218,19 +74646,15 @@ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$pdo_odbc_def_lib''_SQLAllocHandle" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
-echo $ECHO_N "checking for SQLAllocHandle in -l$pdo_odbc_def_lib... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$pdo_odbc_def_lib''_SQLAllocHandle" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
+$as_echo_n "checking for SQLAllocHandle in -l$pdo_odbc_def_lib... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$pdo_odbc_def_lib  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -94248,40 +74672,20 @@ return SQLAllocHandle ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -94293,19 +74697,12 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$pdo_odbc_def_lib_SQLAllocHandle
 
-      { { echo "$as_me:$LINENO: error:
-Your ODBC library does not appear to be ODBC 3 compatible.
-You should consider using iODBC or unixODBC instead, and loading your
-libraries as a driver in that environment; it will emulate the
-functions required for PDO support.
-" >&5
-echo "$as_me: error:
+      as_fn_error "
 Your ODBC library does not appear to be ODBC 3 compatible.
 You should consider using iODBC or unixODBC instead, and loading your
 libraries as a driver in that environment; it will emulate the
 functions required for PDO support.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 
 fi
 
@@ -94317,9 +74714,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$pdo_odbc_def_lib_SQLBindCol
 
-    { { echo "$as_me:$LINENO: error: Your ODBC library does not exist or there was an error. Check config.log for more information" >&5
-echo "$as_me: error: Your ODBC library does not exist or there was an error. Check config.log for more information" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Your ODBC library does not exist or there was an error. Check config.log for more information" "$LINENO" 5
 
 
 fi
@@ -94627,30 +75022,18 @@ EOF
   is_it_shared=$PHP_PDO_SHARED
   is_it_enabled=$PHP_PDO
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_odbc to build statically, but it
-depends on extension pdo, which you've configured to build shared.
-You either need to build pdo_odbc shared or build pdo statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension pdo_odbc to build statically, but it
 depends on extension pdo, which you've configured to build shared.
 You either need to build pdo_odbc shared or build pdo statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension pdo_odbc, which depends on extension pdo,
 but you've either not enabled pdo, or have disabled it.
-" >&5
-echo "$as_me: error:
-You've configured extension pdo_odbc, which depends on extension pdo,
-but you've either not enabled pdo, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 
@@ -94660,11 +75043,11 @@ fi
 
 php_with_pdo_pgsql=no
 
-{ echo "$as_me:$LINENO: checking for PostgreSQL support for PDO" >&5
-echo $ECHO_N "checking for PostgreSQL support for PDO... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL support for PDO" >&5
+$as_echo_n "checking for PostgreSQL support for PDO... " >&6; }
 
 # Check whether --with-pdo-pgsql was given.
-if test "${with_pdo_pgsql+set}" = set; then
+if test "${with_pdo_pgsql+set}" = set; then :
   withval=$with_pdo_pgsql; PHP_PDO_PGSQL=$withval
 else
 
@@ -94696,8 +75079,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -94705,9 +75088,7 @@ echo "${ECHO_T}$ext_output" >&6; }
 if test "$PHP_PDO_PGSQL" != "no"; then
 
   if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-    { { echo "$as_me:$LINENO: error: PDO is not enabled! Add --enable-pdo to your configure line." >&5
-echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5
   fi
 
 
@@ -94715,15 +75096,15 @@ echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line
     PGSQL_INCLUDE=$PGSQL_INCLUDE
   else
 
-    ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    PGSQL_INCLUDE="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    PGSQL_INCLUDE="$ep_realdir"/`basename "$PGSQL_INCLUDE"`
   fi
 
 
-  { echo "$as_me:$LINENO: checking for pg_config" >&5
-echo $ECHO_N "checking for pg_config... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pg_config" >&5
+$as_echo_n "checking for pg_config... " >&6; }
   for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
     if test -x $i/pg_config; then
       PG_CONFIG="$i/pg_config"
@@ -94732,18 +75113,16 @@ echo $ECHO_N "checking for pg_config... $ECHO_C" >&6; }
   done
 
   if test -n "$PG_CONFIG"; then
-    { echo "$as_me:$LINENO: result: $PG_CONFIG" >&5
-echo "${ECHO_T}$PG_CONFIG" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+$as_echo "$PG_CONFIG" >&6; }
     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
     PGSQL_LIBDIR=`$PG_CONFIG --libdir`
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PG_CONFIG_H 1
-_ACEOF
+$as_echo "#define HAVE_PG_CONFIG_H 1" >>confdefs.h
 
   else
-    { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
     if test "$PHP_PDO_PGSQL" = "yes"; then
       PGSQL_SEARCH_PATHS="/usr /usr/local /usr/local/pgsql"
     else
@@ -94757,9 +75136,7 @@ echo "${ECHO_T}not found" >&6; }
           PGSQL_INCLUDE=$i/$j
           if test -r "$i/$j/pg_config.h"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PG_CONFIG_H 1
-_ACEOF
+$as_echo "#define HAVE_PG_CONFIG_H 1" >>confdefs.h
 
           fi
         fi
@@ -94774,41 +75151,33 @@ _ACEOF
   fi
 
   if test -z "$PGSQL_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" >&5
-echo "$as_me: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" "$LINENO" 5
   fi
 
   if test -z "$PGSQL_LIBDIR"; then
-    { { echo "$as_me:$LINENO: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" >&5
-echo "$as_me: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Cannot find libpq.so. Please specify correct PostgreSQL installation path" "$LINENO" 5
   fi
 
   if test -z "$PGSQL_INCLUDE" -a -z "$PGSQL_LIBDIR" ; then
-    { { echo "$as_me:$LINENO: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" >&5
-echo "$as_me: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" "$LINENO" 5
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PDO_PGSQL 1
-_ACEOF
+$as_echo "#define HAVE_PDO_PGSQL 1" >>confdefs.h
 
 
-  { echo "$as_me:$LINENO: checking for openssl dependencies" >&5
-echo $ECHO_N "checking for openssl dependencies... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl dependencies" >&5
+$as_echo_n "checking for openssl dependencies... " >&6; }
   grep openssl $PGSQL_INCLUDE/libpq-fe.h >/dev/null 2>&1
   if test $? -eq 0 ; then
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
         # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -94820,14 +75189,14 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
@@ -94836,11 +75205,11 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -94848,25 +75217,21 @@ fi
       PDO_PGSQL_CFLAGS=`$PKG_CONFIG openssl --cflags`
     fi
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
   old_LIBS=$LIBS
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
-  { echo "$as_me:$LINENO: checking for PQparameterStatus in -lpq" >&5
-echo $ECHO_N "checking for PQparameterStatus in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQparameterStatus+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQparameterStatus in -lpq" >&5
+$as_echo_n "checking for PQparameterStatus in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQparameterStatus+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -94884,43 +75249,20 @@ return PQparameterStatus ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQparameterStatus=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQparameterStatus=no
+  ac_cv_lib_pq_PQparameterStatus=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQparameterStatus" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQparameterStatus" >&6; }
-if test $ac_cv_lib_pq_PQparameterStatus = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQparameterStatus" >&5
+$as_echo "$ac_cv_lib_pq_PQparameterStatus" >&6; }
+if test "x$ac_cv_lib_pq_PQparameterStatus" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQPARAMETERSTATUS 1
-_ACEOF
+$as_echo "#define HAVE_PQPARAMETERSTATUS 1" >>confdefs.h
 
 else
 
@@ -94930,18 +75272,14 @@ else
 fi
 
 
-  { echo "$as_me:$LINENO: checking for PQprepare in -lpq" >&5
-echo $ECHO_N "checking for PQprepare in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQprepare+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQprepare in -lpq" >&5
+$as_echo_n "checking for PQprepare in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQprepare+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -94959,58 +75297,31 @@ return PQprepare ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQprepare=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQprepare=no
+  ac_cv_lib_pq_PQprepare=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQprepare" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQprepare" >&6; }
-if test $ac_cv_lib_pq_PQprepare = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQprepare" >&5
+$as_echo "$ac_cv_lib_pq_PQprepare" >&6; }
+if test "x$ac_cv_lib_pq_PQprepare" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQPREPARE 1
-_ACEOF
+$as_echo "#define HAVE_PQPREPARE 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQescapeStringConn in -lpq" >&5
-echo $ECHO_N "checking for PQescapeStringConn in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQescapeStringConn+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQescapeStringConn in -lpq" >&5
+$as_echo_n "checking for PQescapeStringConn in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQescapeStringConn+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -95028,58 +75339,31 @@ return PQescapeStringConn ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQescapeStringConn=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQescapeStringConn=no
+  ac_cv_lib_pq_PQescapeStringConn=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQescapeStringConn" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQescapeStringConn" >&6; }
-if test $ac_cv_lib_pq_PQescapeStringConn = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQescapeStringConn" >&5
+$as_echo "$ac_cv_lib_pq_PQescapeStringConn" >&6; }
+if test "x$ac_cv_lib_pq_PQescapeStringConn" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQESCAPE_CONN 1
-_ACEOF
+$as_echo "#define HAVE_PQESCAPE_CONN 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQescapeByteaConn in -lpq" >&5
-echo $ECHO_N "checking for PQescapeByteaConn in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQescapeByteaConn+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQescapeByteaConn in -lpq" >&5
+$as_echo_n "checking for PQescapeByteaConn in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQescapeByteaConn+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -95097,59 +75381,32 @@ return PQescapeByteaConn ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQescapeByteaConn=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQescapeByteaConn=no
+  ac_cv_lib_pq_PQescapeByteaConn=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQescapeByteaConn" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQescapeByteaConn" >&6; }
-if test $ac_cv_lib_pq_PQescapeByteaConn = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQescapeByteaConn" >&5
+$as_echo "$ac_cv_lib_pq_PQescapeByteaConn" >&6; }
+if test "x$ac_cv_lib_pq_PQescapeByteaConn" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQESCAPE_BYTEA_CONN 1
-_ACEOF
+$as_echo "#define HAVE_PQESCAPE_BYTEA_CONN 1" >>confdefs.h
 
 fi
 
 
-  { echo "$as_me:$LINENO: checking for pg_encoding_to_char in -lpq" >&5
-echo $ECHO_N "checking for pg_encoding_to_char in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_pg_encoding_to_char+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pg_encoding_to_char in -lpq" >&5
+$as_echo_n "checking for pg_encoding_to_char in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_pg_encoding_to_char+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -95167,43 +75424,20 @@ return pg_encoding_to_char ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_pg_encoding_to_char=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_pg_encoding_to_char=no
+  ac_cv_lib_pq_pg_encoding_to_char=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_pg_encoding_to_char" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_pg_encoding_to_char" >&6; }
-if test $ac_cv_lib_pq_pg_encoding_to_char = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_pg_encoding_to_char" >&5
+$as_echo "$ac_cv_lib_pq_pg_encoding_to_char" >&6; }
+if test "x$ac_cv_lib_pq_pg_encoding_to_char" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1
-_ACEOF
+$as_echo "#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1" >>confdefs.h
 
 fi
 
@@ -95224,10 +75458,10 @@ fi
     ai_p=$PGSQL_LIBDIR
   else
 
-    ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PGSQL_LIBDIR"`
   fi
 
 
@@ -95267,10 +75501,10 @@ fi
     ai_p=$PGSQL_LIBDIR
   else
 
-    ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PGSQL_LIBDIR"`
   fi
 
 
@@ -95320,10 +75554,10 @@ fi
     ai_p=$PGSQL_INCLUDE
   else
 
-    ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PGSQL_INCLUDE"`
   fi
 
 
@@ -95347,14 +75581,14 @@ fi
 
 
 
-  { echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6; }
-if test "${pdo_cv_inc_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
+if test "${pdo_cv_inc_path+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    { echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$abs_srcdir/ext
     elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -95364,14 +75598,12 @@ echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6; }
     fi
 
 fi
-{ echo "$as_me:$LINENO: result: $pdo_cv_inc_path" >&5
-echo "${ECHO_T}$pdo_cv_inc_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
+$as_echo "$pdo_cv_inc_path" >&6; }
   if test -n "$pdo_cv_inc_path"; then
 :
   else
-{ { echo "$as_me:$LINENO: error: Cannot find php_pdo_driver.h." >&5
-echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;}
-   { (exit 1); exit 1; }; }
+as_fn_error "Cannot find php_pdo_driver.h." "$LINENO" 5
   fi
 
 
@@ -95675,30 +75907,18 @@ EOF
   is_it_shared=$PHP_PDO_SHARED
   is_it_enabled=$PHP_PDO
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension pdo_pgsql to build statically, but it
 depends on extension pdo, which you've configured to build shared.
 You either need to build pdo_pgsql shared or build pdo statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension pdo_pgsql to build statically, but it
-depends on extension pdo, which you've configured to build shared.
-You either need to build pdo_pgsql shared or build pdo statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_pgsql, which depends on extension pdo,
-but you've either not enabled pdo, or have disabled it.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension pdo_pgsql, which depends on extension pdo,
 but you've either not enabled pdo, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 
@@ -95708,11 +75928,11 @@ fi
 
 php_with_pdo_sqlite=$PHP_PDO
 
-{ echo "$as_me:$LINENO: checking for sqlite 3 support for PDO" >&5
-echo $ECHO_N "checking for sqlite 3 support for PDO... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite 3 support for PDO" >&5
+$as_echo_n "checking for sqlite 3 support for PDO... " >&6; }
 
 # Check whether --with-pdo-sqlite was given.
-if test "${with_pdo_sqlite+set}" = set; then
+if test "${with_pdo_sqlite+set}" = set; then :
   withval=$with_pdo_sqlite; PHP_PDO_SQLITE=$withval
 else
 
@@ -95744,8 +75964,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -95753,21 +75973,19 @@ echo "${ECHO_T}$ext_output" >&6; }
 if test "$PHP_PDO_SQLITE" != "no"; then
 
   if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
-    { { echo "$as_me:$LINENO: error: PDO is not enabled! Add --enable-pdo to your configure line." >&5
-echo "$as_me: error: PDO is not enabled! Add --enable-pdo to your configure line." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5
   fi
 
 
 
-  { echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6; }
-if test "${pdo_cv_inc_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
+if test "${pdo_cv_inc_path+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    { echo "$as_me:$LINENO: checking for PDO includes" >&5
-echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$abs_srcdir/ext
     elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
@@ -95777,14 +75995,12 @@ echo $ECHO_N "checking for PDO includes... $ECHO_C" >&6; }
     fi
 
 fi
-{ echo "$as_me:$LINENO: result: $pdo_cv_inc_path" >&5
-echo "${ECHO_T}$pdo_cv_inc_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
+$as_echo "$pdo_cv_inc_path" >&6; }
   if test -n "$pdo_cv_inc_path"; then
 :
   else
-{ { echo "$as_me:$LINENO: error: Cannot find php_pdo_driver.h." >&5
-echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;}
-   { (exit 1); exit 1; }; }
+as_fn_error "Cannot find php_pdo_driver.h." "$LINENO" 5
   fi
 
 
@@ -95797,22 +76013,20 @@ echo "$as_me: error: Cannot find php_pdo_driver.h." >&2;}
     if test -r $PHP_PDO_SQLITE/$SEARCH_FOR; then # path given as parameter
       PDO_SQLITE_DIR=$PHP_PDO_SQLITE
     else # search default path list
-      { echo "$as_me:$LINENO: checking for sqlite3 files in default path" >&5
-echo $ECHO_N "checking for sqlite3 files in default path... $ECHO_C" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3 files in default path" >&5
+$as_echo_n "checking for sqlite3 files in default path... " >&6; }
       for i in $SEARCH_PATH ; do
         if test -r $i/$SEARCH_FOR; then
           PDO_SQLITE_DIR=$i
-          { echo "$as_me:$LINENO: result: found in $i" >&5
-echo "${ECHO_T}found in $i" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $i" >&5
+$as_echo "found in $i" >&6; }
         fi
       done
     fi
     if test -z "$PDO_SQLITE_DIR"; then
-      { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-      { { echo "$as_me:$LINENO: error: Please reinstall the sqlite3 distribution" >&5
-echo "$as_me: error: Please reinstall the sqlite3 distribution" >&2;}
-   { (exit 1); exit 1; }; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+      as_fn_error "Please reinstall the sqlite3 distribution" "$LINENO" 5
     fi
 
 
@@ -95822,10 +76036,10 @@ echo "$as_me: error: Please reinstall the sqlite3 distribution" >&2;}
     ai_p=$PDO_SQLITE_DIR/include
   else
 
-    ep_dir="`echo $PDO_SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PDO_SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PDO_SQLITE_DIR/include"`
   fi
 
 
@@ -95912,10 +76126,10 @@ echo "$as_me: error: Please reinstall the sqlite3 distribution" >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -95947,19 +76161,15 @@ echo "$as_me: error: Please reinstall the sqlite3 distribution" >&2;}
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$LIBNAME''_$LIBSYMBOL" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $LIBSYMBOL in -l$LIBNAME" >&5
-echo $ECHO_N "checking for $LIBSYMBOL in -l$LIBNAME... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$LIBNAME''_$LIBSYMBOL" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBSYMBOL in -l$LIBNAME" >&5
+$as_echo_n "checking for $LIBSYMBOL in -l$LIBNAME... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIBNAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -95977,40 +76187,20 @@ return $LIBSYMBOL ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -96027,10 +76217,10 @@ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
     ai_p=$PDO_SQLITE_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $PDO_SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PDO_SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PDO_SQLITE_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -96070,10 +76260,10 @@ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
     ai_p=$PDO_SQLITE_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $PDO_SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PDO_SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PDO_SQLITE_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PDO_SQLITE_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -96113,9 +76303,7 @@ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PDO_SQLITELIB 1
-_ACEOF
+$as_echo "#define HAVE_PDO_SQLITELIB 1" >>confdefs.h
 
 
 
@@ -96125,9 +76313,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$LIBNAME_$LIBSYMBOL
 
-      { { echo "$as_me:$LINENO: error: wrong sqlite lib version or lib not found" >&5
-echo "$as_me: error: wrong sqlite lib version or lib not found" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "wrong sqlite lib version or lib not found" "$LINENO" 5
 
 
 fi
@@ -96192,10 +76378,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -96227,18 +76413,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for sqlite3_key in -lsqlite3" >&5
-echo $ECHO_N "checking for sqlite3_key in -lsqlite3... $ECHO_C" >&6; }
-if test "${ac_cv_lib_sqlite3_sqlite3_key+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_key in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_key in -lsqlite3... " >&6; }
+if test "${ac_cv_lib_sqlite3_sqlite3_key+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -96256,47 +76438,24 @@ return sqlite3_key ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sqlite3_sqlite3_key=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_sqlite3_sqlite3_key=no
+  ac_cv_lib_sqlite3_sqlite3_key=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_key" >&5
-echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_key" >&6; }
-if test $ac_cv_lib_sqlite3_sqlite3_key = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_key" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_key" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_key" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SQLITE3_KEY 1
-_ACEOF
+$as_echo "#define HAVE_SQLITE3_KEY 1" >>confdefs.h
 
 
 
@@ -96968,30 +77127,18 @@ EOF
   is_it_shared=$PHP_SQLITE3_SHARED
   is_it_enabled=$PHP_SQLITE3
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension pdo_sqlite to build statically, but it
 depends on extension sqlite3, which you've configured to build shared.
 You either need to build pdo_sqlite shared or build sqlite3 statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension pdo_sqlite to build statically, but it
-depends on extension sqlite3, which you've configured to build shared.
-You either need to build pdo_sqlite shared or build sqlite3 statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension pdo_sqlite, which depends on extension sqlite3,
 but you've either not enabled sqlite3, or have disabled it.
-" >&5
-echo "$as_me: error:
-You've configured extension pdo_sqlite, which depends on extension sqlite3,
-but you've either not enabled sqlite3, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 
@@ -97001,10 +77148,10 @@ but you've either not enabled sqlite3, or have disabled it.
     ai_p=$abs_srcdir/ext/sqlite3/libsqlite
   else
 
-    ep_dir="`echo $abs_srcdir/ext/sqlite3/libsqlite|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $abs_srcdir/ext/sqlite3/libsqlite|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$abs_srcdir/ext/sqlite3/libsqlite\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$abs_srcdir/ext/sqlite3/libsqlite"`
   fi
 
 
@@ -97026,235 +77173,25 @@ but you've either not enabled sqlite3, or have disabled it.
   fi
 
 
-
-
-for ac_func in usleep nanosleep
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+      for ac_func in usleep nanosleep
+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"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
-
-for ac_header in time.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+      for ac_header in time.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "time.h" "ac_cv_header_time_h" "$ac_includes_default"
+if test "x$ac_cv_header_time_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_TIME_H 1
 _ACEOF
 
 fi
@@ -97323,10 +77260,10 @@ done
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -97358,18 +77295,14 @@ done
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for fdatasync in -lrt" >&5
-echo $ECHO_N "checking for fdatasync in -lrt... $ECHO_C" >&6; }
-if test "${ac_cv_lib_rt_fdatasync+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdatasync in -lrt" >&5
+$as_echo_n "checking for fdatasync in -lrt... " >&6; }
+if test "${ac_cv_lib_rt_fdatasync+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -97387,39 +77320,18 @@ return fdatasync ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_rt_fdatasync=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_rt_fdatasync=no
+  ac_cv_lib_rt_fdatasync=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_fdatasync" >&5
-echo "${ECHO_T}$ac_cv_lib_rt_fdatasync" >&6; }
-if test $ac_cv_lib_rt_fdatasync = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_fdatasync" >&5
+$as_echo "$ac_cv_lib_rt_fdatasync" >&6; }
+if test "x$ac_cv_lib_rt_fdatasync" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -97463,30 +77375,18 @@ fi
   is_it_shared=$PHP_PDO_SHARED
   is_it_enabled=$PHP_PDO
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_sqlite to build statically, but it
-depends on extension pdo, which you've configured to build shared.
-You either need to build pdo_sqlite shared or build pdo statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension pdo_sqlite to build statically, but it
 depends on extension pdo, which you've configured to build shared.
 You either need to build pdo_sqlite shared or build pdo statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension pdo_sqlite, which depends on extension pdo,
-but you've either not enabled pdo, or have disabled it.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension pdo_sqlite, which depends on extension pdo,
 but you've either not enabled pdo, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 
@@ -97496,11 +77396,11 @@ fi
 
 php_with_pgsql=no
 
-{ echo "$as_me:$LINENO: checking for PostgreSQL support" >&5
-echo $ECHO_N "checking for PostgreSQL support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL support" >&5
+$as_echo_n "checking for PostgreSQL support... " >&6; }
 
 # Check whether --with-pgsql was given.
-if test "${with_pgsql+set}" = set; then
+if test "${with_pgsql+set}" = set; then :
   withval=$with_pgsql; PHP_PGSQL=$withval
 else
 
@@ -97532,8 +77432,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -97544,15 +77444,15 @@ if test "$PHP_PGSQL" != "no"; then
     PGSQL_INCLUDE=$PGSQL_INCLUDE
   else
 
-    ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    PGSQL_INCLUDE="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    PGSQL_INCLUDE="$ep_realdir"/`basename "$PGSQL_INCLUDE"`
   fi
 
 
-  { echo "$as_me:$LINENO: checking for pg_config" >&5
-echo $ECHO_N "checking for pg_config... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pg_config" >&5
+$as_echo_n "checking for pg_config... " >&6; }
   for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
 	if test -x $i/pg_config; then
       PG_CONFIG="$i/pg_config"
@@ -97561,20 +77461,18 @@ echo $ECHO_N "checking for pg_config... $ECHO_C" >&6; }
   done
 
   if test -n "$PG_CONFIG"; then
-    { echo "$as_me:$LINENO: result: $PG_CONFIG" >&5
-echo "${ECHO_T}$PG_CONFIG" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+$as_echo "$PG_CONFIG" >&6; }
     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
     PGSQL_LIBDIR=`$PG_CONFIG --libdir`
     if test -r "$PGSQL_INCLUDE/pg_config.h"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PG_CONFIG_H 1
-_ACEOF
+$as_echo "#define HAVE_PG_CONFIG_H 1" >>confdefs.h
 
     fi
   else
-    { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
     if test "$PHP_PGSQL" = "yes"; then
       PGSQL_SEARCH_PATHS="/usr /usr/local /usr/local/pgsql"
     else
@@ -97588,9 +77486,7 @@ echo "${ECHO_T}not found" >&6; }
           PGSQL_INCLUDE=$i/$j
           if test -r "$i/$j/pg_config.h"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PG_CONFIG_H 1
-_ACEOF
+$as_echo "#define HAVE_PG_CONFIG_H 1" >>confdefs.h
 
           fi
         fi
@@ -97605,43 +77501,31 @@ _ACEOF
   fi
 
   if test -z "$PGSQL_INCLUDE"; then
-    { { echo "$as_me:$LINENO: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" >&5
-echo "$as_me: error: Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Cannot find libpq-fe.h. Please specify correct PostgreSQL installation path" "$LINENO" 5
   fi
 
   if test -z "$PGSQL_LIBDIR"; then
-    { { echo "$as_me:$LINENO: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" >&5
-echo "$as_me: error: Cannot find libpq.so. Please specify correct PostgreSQL installation path" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Cannot find libpq.so. Please specify correct PostgreSQL installation path" "$LINENO" 5
   fi
 
   if test -z "$PGSQL_INCLUDE" -a -z "$PGSQL_LIBDIR" ; then
-    { { echo "$as_me:$LINENO: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" >&5
-echo "$as_me: error: Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Unable to find libpq anywhere under $PGSQL_SEARCH_PATHS" "$LINENO" 5
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PGSQL 1
-_ACEOF
+$as_echo "#define HAVE_PGSQL 1" >>confdefs.h
 
   old_LIBS=$LIBS
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
-  { echo "$as_me:$LINENO: checking for PQescapeString in -lpq" >&5
-echo $ECHO_N "checking for PQescapeString in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQescapeString+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQescapeString in -lpq" >&5
+$as_echo_n "checking for PQescapeString in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQescapeString+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -97659,58 +77543,31 @@ return PQescapeString ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQescapeString=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQescapeString=no
+  ac_cv_lib_pq_PQescapeString=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQescapeString" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQescapeString" >&6; }
-if test $ac_cv_lib_pq_PQescapeString = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQescapeString" >&5
+$as_echo "$ac_cv_lib_pq_PQescapeString" >&6; }
+if test "x$ac_cv_lib_pq_PQescapeString" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQESCAPE 1
-_ACEOF
+$as_echo "#define HAVE_PQESCAPE 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQunescapeBytea in -lpq" >&5
-echo $ECHO_N "checking for PQunescapeBytea in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQunescapeBytea+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQunescapeBytea in -lpq" >&5
+$as_echo_n "checking for PQunescapeBytea in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQunescapeBytea+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -97728,58 +77585,31 @@ return PQunescapeBytea ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQunescapeBytea=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQunescapeBytea=no
+  ac_cv_lib_pq_PQunescapeBytea=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQunescapeBytea" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQunescapeBytea" >&6; }
-if test $ac_cv_lib_pq_PQunescapeBytea = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQunescapeBytea" >&5
+$as_echo "$ac_cv_lib_pq_PQunescapeBytea" >&6; }
+if test "x$ac_cv_lib_pq_PQunescapeBytea" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQUNESCAPEBYTEA 1
-_ACEOF
+$as_echo "#define HAVE_PQUNESCAPEBYTEA 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQsetnonblocking in -lpq" >&5
-echo $ECHO_N "checking for PQsetnonblocking in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQsetnonblocking+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsetnonblocking in -lpq" >&5
+$as_echo_n "checking for PQsetnonblocking in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQsetnonblocking+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -97797,58 +77627,31 @@ return PQsetnonblocking ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQsetnonblocking=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQsetnonblocking=no
+  ac_cv_lib_pq_PQsetnonblocking=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsetnonblocking" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQsetnonblocking" >&6; }
-if test $ac_cv_lib_pq_PQsetnonblocking = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQsetnonblocking" >&5
+$as_echo "$ac_cv_lib_pq_PQsetnonblocking" >&6; }
+if test "x$ac_cv_lib_pq_PQsetnonblocking" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQSETNONBLOCKING 1
-_ACEOF
+$as_echo "#define HAVE_PQSETNONBLOCKING 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQcmdTuples in -lpq" >&5
-echo $ECHO_N "checking for PQcmdTuples in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQcmdTuples+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQcmdTuples in -lpq" >&5
+$as_echo_n "checking for PQcmdTuples in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQcmdTuples+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -97866,58 +77669,31 @@ return PQcmdTuples ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQcmdTuples=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQcmdTuples=no
+  ac_cv_lib_pq_PQcmdTuples=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQcmdTuples" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQcmdTuples" >&6; }
-if test $ac_cv_lib_pq_PQcmdTuples = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQcmdTuples" >&5
+$as_echo "$ac_cv_lib_pq_PQcmdTuples" >&6; }
+if test "x$ac_cv_lib_pq_PQcmdTuples" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQCMDTUPLES 1
-_ACEOF
+$as_echo "#define HAVE_PQCMDTUPLES 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQoidValue in -lpq" >&5
-echo $ECHO_N "checking for PQoidValue in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQoidValue+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQoidValue in -lpq" >&5
+$as_echo_n "checking for PQoidValue in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQoidValue+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -97935,58 +77711,31 @@ return PQoidValue ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQoidValue=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQoidValue=no
+  ac_cv_lib_pq_PQoidValue=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQoidValue" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQoidValue" >&6; }
-if test $ac_cv_lib_pq_PQoidValue = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQoidValue" >&5
+$as_echo "$ac_cv_lib_pq_PQoidValue" >&6; }
+if test "x$ac_cv_lib_pq_PQoidValue" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQOIDVALUE 1
-_ACEOF
+$as_echo "#define HAVE_PQOIDVALUE 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQclientEncoding in -lpq" >&5
-echo $ECHO_N "checking for PQclientEncoding in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQclientEncoding+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQclientEncoding in -lpq" >&5
+$as_echo_n "checking for PQclientEncoding in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQclientEncoding+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -98004,58 +77753,31 @@ return PQclientEncoding ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQclientEncoding=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQclientEncoding=no
+  ac_cv_lib_pq_PQclientEncoding=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQclientEncoding" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQclientEncoding" >&6; }
-if test $ac_cv_lib_pq_PQclientEncoding = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQclientEncoding" >&5
+$as_echo "$ac_cv_lib_pq_PQclientEncoding" >&6; }
+if test "x$ac_cv_lib_pq_PQclientEncoding" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQCLIENTENCODING 1
-_ACEOF
+$as_echo "#define HAVE_PQCLIENTENCODING 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQparameterStatus in -lpq" >&5
-echo $ECHO_N "checking for PQparameterStatus in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQparameterStatus+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQparameterStatus in -lpq" >&5
+$as_echo_n "checking for PQparameterStatus in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQparameterStatus+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -98073,58 +77795,31 @@ return PQparameterStatus ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQparameterStatus=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQparameterStatus=no
+  ac_cv_lib_pq_PQparameterStatus=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQparameterStatus" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQparameterStatus" >&6; }
-if test $ac_cv_lib_pq_PQparameterStatus = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQparameterStatus" >&5
+$as_echo "$ac_cv_lib_pq_PQparameterStatus" >&6; }
+if test "x$ac_cv_lib_pq_PQparameterStatus" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQPARAMETERSTATUS 1
-_ACEOF
+$as_echo "#define HAVE_PQPARAMETERSTATUS 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQprotocolVersion in -lpq" >&5
-echo $ECHO_N "checking for PQprotocolVersion in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQprotocolVersion+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQprotocolVersion in -lpq" >&5
+$as_echo_n "checking for PQprotocolVersion in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQprotocolVersion+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -98142,58 +77837,31 @@ return PQprotocolVersion ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQprotocolVersion=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQprotocolVersion=no
+  ac_cv_lib_pq_PQprotocolVersion=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQprotocolVersion" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQprotocolVersion" >&6; }
-if test $ac_cv_lib_pq_PQprotocolVersion = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQprotocolVersion" >&5
+$as_echo "$ac_cv_lib_pq_PQprotocolVersion" >&6; }
+if test "x$ac_cv_lib_pq_PQprotocolVersion" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQPROTOCOLVERSION 1
-_ACEOF
+$as_echo "#define HAVE_PQPROTOCOLVERSION 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQtransactionStatus in -lpq" >&5
-echo $ECHO_N "checking for PQtransactionStatus in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQtransactionStatus+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQtransactionStatus in -lpq" >&5
+$as_echo_n "checking for PQtransactionStatus in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQtransactionStatus+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -98211,58 +77879,31 @@ return PQtransactionStatus ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQtransactionStatus=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQtransactionStatus=no
+  ac_cv_lib_pq_PQtransactionStatus=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQtransactionStatus" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQtransactionStatus" >&6; }
-if test $ac_cv_lib_pq_PQtransactionStatus = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQtransactionStatus" >&5
+$as_echo "$ac_cv_lib_pq_PQtransactionStatus" >&6; }
+if test "x$ac_cv_lib_pq_PQtransactionStatus" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PGTRANSACTIONSTATUS 1
-_ACEOF
+$as_echo "#define HAVE_PGTRANSACTIONSTATUS 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQexecParams in -lpq" >&5
-echo $ECHO_N "checking for PQexecParams in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQexecParams+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQexecParams in -lpq" >&5
+$as_echo_n "checking for PQexecParams in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQexecParams+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -98280,58 +77921,31 @@ return PQexecParams ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQexecParams=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQexecParams=no
+  ac_cv_lib_pq_PQexecParams=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQexecParams" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQexecParams" >&6; }
-if test $ac_cv_lib_pq_PQexecParams = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQexecParams" >&5
+$as_echo "$ac_cv_lib_pq_PQexecParams" >&6; }
+if test "x$ac_cv_lib_pq_PQexecParams" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQEXECPARAMS 1
-_ACEOF
+$as_echo "#define HAVE_PQEXECPARAMS 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQprepare in -lpq" >&5
-echo $ECHO_N "checking for PQprepare in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQprepare+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQprepare in -lpq" >&5
+$as_echo_n "checking for PQprepare in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQprepare+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -98349,58 +77963,31 @@ return PQprepare ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQprepare=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQprepare=no
+  ac_cv_lib_pq_PQprepare=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQprepare" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQprepare" >&6; }
-if test $ac_cv_lib_pq_PQprepare = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQprepare" >&5
+$as_echo "$ac_cv_lib_pq_PQprepare" >&6; }
+if test "x$ac_cv_lib_pq_PQprepare" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQPREPARE 1
-_ACEOF
+$as_echo "#define HAVE_PQPREPARE 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQexecPrepared in -lpq" >&5
-echo $ECHO_N "checking for PQexecPrepared in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQexecPrepared+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQexecPrepared in -lpq" >&5
+$as_echo_n "checking for PQexecPrepared in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQexecPrepared+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -98418,58 +78005,31 @@ return PQexecPrepared ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQexecPrepared=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQexecPrepared=no
+  ac_cv_lib_pq_PQexecPrepared=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQexecPrepared" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQexecPrepared" >&6; }
-if test $ac_cv_lib_pq_PQexecPrepared = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQexecPrepared" >&5
+$as_echo "$ac_cv_lib_pq_PQexecPrepared" >&6; }
+if test "x$ac_cv_lib_pq_PQexecPrepared" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQEXECPREPARED 1
-_ACEOF
+$as_echo "#define HAVE_PQEXECPREPARED 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQresultErrorField in -lpq" >&5
-echo $ECHO_N "checking for PQresultErrorField in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQresultErrorField+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQresultErrorField in -lpq" >&5
+$as_echo_n "checking for PQresultErrorField in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQresultErrorField+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -98487,58 +78047,31 @@ return PQresultErrorField ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQresultErrorField=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQresultErrorField=no
+  ac_cv_lib_pq_PQresultErrorField=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQresultErrorField" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQresultErrorField" >&6; }
-if test $ac_cv_lib_pq_PQresultErrorField = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQresultErrorField" >&5
+$as_echo "$ac_cv_lib_pq_PQresultErrorField" >&6; }
+if test "x$ac_cv_lib_pq_PQresultErrorField" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQRESULTERRORFIELD 1
-_ACEOF
+$as_echo "#define HAVE_PQRESULTERRORFIELD 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQsendQueryParams in -lpq" >&5
-echo $ECHO_N "checking for PQsendQueryParams in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQsendQueryParams+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsendQueryParams in -lpq" >&5
+$as_echo_n "checking for PQsendQueryParams in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQsendQueryParams+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -98556,58 +78089,31 @@ return PQsendQueryParams ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQsendQueryParams=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQsendQueryParams=no
+  ac_cv_lib_pq_PQsendQueryParams=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsendQueryParams" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQsendQueryParams" >&6; }
-if test $ac_cv_lib_pq_PQsendQueryParams = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQsendQueryParams" >&5
+$as_echo "$ac_cv_lib_pq_PQsendQueryParams" >&6; }
+if test "x$ac_cv_lib_pq_PQsendQueryParams" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQSENDQUERYPARAMS 1
-_ACEOF
+$as_echo "#define HAVE_PQSENDQUERYPARAMS 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQsendPrepare in -lpq" >&5
-echo $ECHO_N "checking for PQsendPrepare in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQsendPrepare+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsendPrepare in -lpq" >&5
+$as_echo_n "checking for PQsendPrepare in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQsendPrepare+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -98625,58 +78131,31 @@ return PQsendPrepare ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQsendPrepare=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQsendPrepare=no
+  ac_cv_lib_pq_PQsendPrepare=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsendPrepare" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQsendPrepare" >&6; }
-if test $ac_cv_lib_pq_PQsendPrepare = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQsendPrepare" >&5
+$as_echo "$ac_cv_lib_pq_PQsendPrepare" >&6; }
+if test "x$ac_cv_lib_pq_PQsendPrepare" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQSENDPREPARE 1
-_ACEOF
+$as_echo "#define HAVE_PQSENDPREPARE 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQsendQueryPrepared in -lpq" >&5
-echo $ECHO_N "checking for PQsendQueryPrepared in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQsendQueryPrepared+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsendQueryPrepared in -lpq" >&5
+$as_echo_n "checking for PQsendQueryPrepared in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQsendQueryPrepared+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -98694,58 +78173,31 @@ return PQsendQueryPrepared ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQsendQueryPrepared=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQsendQueryPrepared=no
+  ac_cv_lib_pq_PQsendQueryPrepared=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsendQueryPrepared" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQsendQueryPrepared" >&6; }
-if test $ac_cv_lib_pq_PQsendQueryPrepared = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQsendQueryPrepared" >&5
+$as_echo "$ac_cv_lib_pq_PQsendQueryPrepared" >&6; }
+if test "x$ac_cv_lib_pq_PQsendQueryPrepared" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQSENDQUERYPREPARED 1
-_ACEOF
+$as_echo "#define HAVE_PQSENDQUERYPREPARED 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQputCopyData in -lpq" >&5
-echo $ECHO_N "checking for PQputCopyData in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQputCopyData+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQputCopyData in -lpq" >&5
+$as_echo_n "checking for PQputCopyData in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQputCopyData+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -98763,58 +78215,31 @@ return PQputCopyData ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQputCopyData=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQputCopyData=no
+  ac_cv_lib_pq_PQputCopyData=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQputCopyData" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQputCopyData" >&6; }
-if test $ac_cv_lib_pq_PQputCopyData = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQputCopyData" >&5
+$as_echo "$ac_cv_lib_pq_PQputCopyData" >&6; }
+if test "x$ac_cv_lib_pq_PQputCopyData" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQPUTCOPYDATA 1
-_ACEOF
+$as_echo "#define HAVE_PQPUTCOPYDATA 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQputCopyEnd in -lpq" >&5
-echo $ECHO_N "checking for PQputCopyEnd in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQputCopyEnd+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQputCopyEnd in -lpq" >&5
+$as_echo_n "checking for PQputCopyEnd in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQputCopyEnd+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -98832,58 +78257,31 @@ return PQputCopyEnd ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQputCopyEnd=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQputCopyEnd=no
+  ac_cv_lib_pq_PQputCopyEnd=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQputCopyEnd" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQputCopyEnd" >&6; }
-if test $ac_cv_lib_pq_PQputCopyEnd = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQputCopyEnd" >&5
+$as_echo "$ac_cv_lib_pq_PQputCopyEnd" >&6; }
+if test "x$ac_cv_lib_pq_PQputCopyEnd" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQPUTCOPYEND 1
-_ACEOF
+$as_echo "#define HAVE_PQPUTCOPYEND 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQgetCopyData in -lpq" >&5
-echo $ECHO_N "checking for PQgetCopyData in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQgetCopyData+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQgetCopyData in -lpq" >&5
+$as_echo_n "checking for PQgetCopyData in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQgetCopyData+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -98901,58 +78299,31 @@ return PQgetCopyData ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQgetCopyData=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQgetCopyData=no
+  ac_cv_lib_pq_PQgetCopyData=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQgetCopyData" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQgetCopyData" >&6; }
-if test $ac_cv_lib_pq_PQgetCopyData = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQgetCopyData" >&5
+$as_echo "$ac_cv_lib_pq_PQgetCopyData" >&6; }
+if test "x$ac_cv_lib_pq_PQgetCopyData" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQGETCOPYDATA 1
-_ACEOF
+$as_echo "#define HAVE_PQGETCOPYDATA 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQfreemem in -lpq" >&5
-echo $ECHO_N "checking for PQfreemem in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQfreemem+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQfreemem in -lpq" >&5
+$as_echo_n "checking for PQfreemem in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQfreemem+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -98970,58 +78341,31 @@ return PQfreemem ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQfreemem=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQfreemem=no
+  ac_cv_lib_pq_PQfreemem=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQfreemem" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQfreemem" >&6; }
-if test $ac_cv_lib_pq_PQfreemem = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQfreemem" >&5
+$as_echo "$ac_cv_lib_pq_PQfreemem" >&6; }
+if test "x$ac_cv_lib_pq_PQfreemem" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQFREEMEM 1
-_ACEOF
+$as_echo "#define HAVE_PQFREEMEM 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQsetErrorVerbosity in -lpq" >&5
-echo $ECHO_N "checking for PQsetErrorVerbosity in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQsetErrorVerbosity+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQsetErrorVerbosity in -lpq" >&5
+$as_echo_n "checking for PQsetErrorVerbosity in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQsetErrorVerbosity+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -99039,58 +78383,31 @@ return PQsetErrorVerbosity ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQsetErrorVerbosity=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQsetErrorVerbosity=no
+  ac_cv_lib_pq_PQsetErrorVerbosity=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQsetErrorVerbosity" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQsetErrorVerbosity" >&6; }
-if test $ac_cv_lib_pq_PQsetErrorVerbosity = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQsetErrorVerbosity" >&5
+$as_echo "$ac_cv_lib_pq_PQsetErrorVerbosity" >&6; }
+if test "x$ac_cv_lib_pq_PQsetErrorVerbosity" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQSETERRORVERBOSITY 1
-_ACEOF
+$as_echo "#define HAVE_PQSETERRORVERBOSITY 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQftable in -lpq" >&5
-echo $ECHO_N "checking for PQftable in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQftable+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQftable in -lpq" >&5
+$as_echo_n "checking for PQftable in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQftable+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -99108,58 +78425,31 @@ return PQftable ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQftable=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQftable=no
+  ac_cv_lib_pq_PQftable=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQftable" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQftable" >&6; }
-if test $ac_cv_lib_pq_PQftable = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQftable" >&5
+$as_echo "$ac_cv_lib_pq_PQftable" >&6; }
+if test "x$ac_cv_lib_pq_PQftable" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQFTABLE 1
-_ACEOF
+$as_echo "#define HAVE_PQFTABLE 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQescapeStringConn in -lpq" >&5
-echo $ECHO_N "checking for PQescapeStringConn in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQescapeStringConn+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQescapeStringConn in -lpq" >&5
+$as_echo_n "checking for PQescapeStringConn in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQescapeStringConn+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -99177,58 +78467,31 @@ return PQescapeStringConn ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQescapeStringConn=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQescapeStringConn=no
+  ac_cv_lib_pq_PQescapeStringConn=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQescapeStringConn" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQescapeStringConn" >&6; }
-if test $ac_cv_lib_pq_PQescapeStringConn = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQescapeStringConn" >&5
+$as_echo "$ac_cv_lib_pq_PQescapeStringConn" >&6; }
+if test "x$ac_cv_lib_pq_PQescapeStringConn" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQESCAPE_CONN 1
-_ACEOF
+$as_echo "#define HAVE_PQESCAPE_CONN 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQescapeByteaConn in -lpq" >&5
-echo $ECHO_N "checking for PQescapeByteaConn in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQescapeByteaConn+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQescapeByteaConn in -lpq" >&5
+$as_echo_n "checking for PQescapeByteaConn in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQescapeByteaConn+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -99246,58 +78509,31 @@ return PQescapeByteaConn ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQescapeByteaConn=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQescapeByteaConn=no
+  ac_cv_lib_pq_PQescapeByteaConn=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQescapeByteaConn" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQescapeByteaConn" >&6; }
-if test $ac_cv_lib_pq_PQescapeByteaConn = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQescapeByteaConn" >&5
+$as_echo "$ac_cv_lib_pq_PQescapeByteaConn" >&6; }
+if test "x$ac_cv_lib_pq_PQescapeByteaConn" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQESCAPE_BYTEA_CONN 1
-_ACEOF
+$as_echo "#define HAVE_PQESCAPE_BYTEA_CONN 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for pg_encoding_to_char in -lpq" >&5
-echo $ECHO_N "checking for pg_encoding_to_char in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_pg_encoding_to_char+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pg_encoding_to_char in -lpq" >&5
+$as_echo_n "checking for pg_encoding_to_char in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_pg_encoding_to_char+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -99315,58 +78551,31 @@ return pg_encoding_to_char ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_pg_encoding_to_char=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_pg_encoding_to_char=no
+  ac_cv_lib_pq_pg_encoding_to_char=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_pg_encoding_to_char" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_pg_encoding_to_char" >&6; }
-if test $ac_cv_lib_pq_pg_encoding_to_char = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_pg_encoding_to_char" >&5
+$as_echo "$ac_cv_lib_pq_pg_encoding_to_char" >&6; }
+if test "x$ac_cv_lib_pq_pg_encoding_to_char" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1
-_ACEOF
+$as_echo "#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for lo_create in -lpq" >&5
-echo $ECHO_N "checking for lo_create in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_lo_create+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lo_create in -lpq" >&5
+$as_echo_n "checking for lo_create in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_lo_create+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -99384,58 +78593,31 @@ return lo_create ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_lo_create=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_lo_create=no
+  ac_cv_lib_pq_lo_create=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_lo_create" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_lo_create" >&6; }
-if test $ac_cv_lib_pq_lo_create = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_lo_create" >&5
+$as_echo "$ac_cv_lib_pq_lo_create" >&6; }
+if test "x$ac_cv_lib_pq_lo_create" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PG_LO_CREATE 1
-_ACEOF
+$as_echo "#define HAVE_PG_LO_CREATE 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for lo_import_with_oid in -lpq" >&5
-echo $ECHO_N "checking for lo_import_with_oid in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_lo_import_with_oid+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lo_import_with_oid in -lpq" >&5
+$as_echo_n "checking for lo_import_with_oid in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_lo_import_with_oid+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -99453,58 +78635,31 @@ return lo_import_with_oid ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_lo_import_with_oid=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_lo_import_with_oid=no
+  ac_cv_lib_pq_lo_import_with_oid=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_lo_import_with_oid" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_lo_import_with_oid" >&6; }
-if test $ac_cv_lib_pq_lo_import_with_oid = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_lo_import_with_oid" >&5
+$as_echo "$ac_cv_lib_pq_lo_import_with_oid" >&6; }
+if test "x$ac_cv_lib_pq_lo_import_with_oid" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PG_LO_IMPORT_WITH_OID 1
-_ACEOF
+$as_echo "#define HAVE_PG_LO_IMPORT_WITH_OID 1" >>confdefs.h
 
 fi
 
-  { echo "$as_me:$LINENO: checking for PQescapeLiteral in -lpq" >&5
-echo $ECHO_N "checking for PQescapeLiteral in -lpq... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pq_PQescapeLiteral+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQescapeLiteral in -lpq" >&5
+$as_echo_n "checking for PQescapeLiteral in -lpq... " >&6; }
+if test "${ac_cv_lib_pq_PQescapeLiteral+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -99522,43 +78677,20 @@ return PQescapeLiteral ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQescapeLiteral=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_pq_PQescapeLiteral=no
+  ac_cv_lib_pq_PQescapeLiteral=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pq_PQescapeLiteral" >&5
-echo "${ECHO_T}$ac_cv_lib_pq_PQescapeLiteral" >&6; }
-if test $ac_cv_lib_pq_PQescapeLiteral = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQescapeLiteral" >&5
+$as_echo "$ac_cv_lib_pq_PQescapeLiteral" >&6; }
+if test "x$ac_cv_lib_pq_PQescapeLiteral" = x""yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PQESCAPELITERAL 1
-_ACEOF
+$as_echo "#define HAVE_PQESCAPELITERAL 1" >>confdefs.h
 
 fi
 
@@ -99577,10 +78709,10 @@ fi
     ai_p=$PGSQL_LIBDIR
   else
 
-    ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PGSQL_LIBDIR"`
   fi
 
 
@@ -99620,10 +78752,10 @@ fi
     ai_p=$PGSQL_LIBDIR
   else
 
-    ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PGSQL_LIBDIR"`
   fi
 
 
@@ -99673,10 +78805,10 @@ fi
     ai_p=$PGSQL_INCLUDE
   else
 
-    ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PGSQL_INCLUDE"`
   fi
 
 
@@ -99999,10 +79131,10 @@ fi
 
 php_enable_phar=yes
 
-{ echo "$as_me:$LINENO: checking for phar archive support" >&5
-echo $ECHO_N "checking for phar archive support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for phar archive support" >&5
+$as_echo_n "checking for phar archive support... " >&6; }
 # Check whether --enable-phar was given.
-if test "${enable_phar+set}" = set; then
+if test "${enable_phar+set}" = set; then :
   enableval=$enable_phar; PHP_PHAR=$enableval
 else
 
@@ -100034,8 +79166,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -100334,35 +79466,31 @@ EOF
 
   fi
 
-  { echo "$as_me:$LINENO: checking for phar openssl support" >&5
-echo $ECHO_N "checking for phar openssl support... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for phar openssl support" >&5
+$as_echo_n "checking for phar openssl support... " >&6; }
   if test "$PHP_HASH_SHARED" != "yes"; then
     if test "$PHP_HASH" != "no"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define PHAR_HASH_OK 1
-_ACEOF
+$as_echo "#define PHAR_HASH_OK 1" >>confdefs.h
 
     fi
   else
-    { echo "$as_me:$LINENO: WARNING: Phar: sha256/sha512 signature support disabled if ext/hash is built shared" >&5
-echo "$as_me: WARNING: Phar: sha256/sha512 signature support disabled if ext/hash is built shared" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Phar: sha256/sha512 signature support disabled if ext/hash is built shared" >&5
+$as_echo "$as_me: WARNING: Phar: sha256/sha512 signature support disabled if ext/hash is built shared" >&2;}
   fi
   if test "$PHP_OPENSSL_SHARED" = "yes"; then
-    { echo "$as_me:$LINENO: result: no (shared openssl)" >&5
-echo "${ECHO_T}no (shared openssl)" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (shared openssl)" >&5
+$as_echo "no (shared openssl)" >&6; }
   else
     if test "$PHP_OPENSSL" = "yes"; then
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define PHAR_HAVE_OPENSSL 1
-_ACEOF
+$as_echo "#define PHAR_HAVE_OPENSSL 1" >>confdefs.h
 
     else
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
   fi
 
@@ -100370,30 +79498,18 @@ echo "${ECHO_T}no" >&6; }
   is_it_shared=$PHP_HASH_SHARED
   is_it_enabled=$PHP_HASH
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension phar to build statically, but it
 depends on extension hash, which you've configured to build shared.
 You either need to build phar shared or build hash statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension phar to build statically, but it
-depends on extension hash, which you've configured to build shared.
-You either need to build phar shared or build hash statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension phar, which depends on extension hash,
-but you've either not enabled hash, or have disabled it.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension phar, which depends on extension hash,
 but you've either not enabled hash, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 
@@ -100401,30 +79517,18 @@ but you've either not enabled hash, or have disabled it.
   is_it_shared=$PHP_SPL_SHARED
   is_it_enabled=$PHP_SPL
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension phar to build statically, but it
 depends on extension spl, which you've configured to build shared.
 You either need to build phar shared or build spl statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension phar to build statically, but it
-depends on extension spl, which you've configured to build shared.
-You either need to build phar shared or build spl statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension phar, which depends on extension spl,
 but you've either not enabled spl, or have disabled it.
-" >&5
-echo "$as_me: error:
-You've configured extension phar, which depends on extension spl,
-but you've either not enabled spl, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 
@@ -100433,16 +79537,20 @@ but you've either not enabled spl, or have disabled it.
   ac_builddir=$ext_builddir
   test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
 
+
+
+  PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES ext/phar/phar.1 ext/phar/phar.phar.1"
+
 fi
 
 
 
 php_enable_posix=yes
 
-{ echo "$as_me:$LINENO: checking whether to enable POSIX-like functions" >&5
-echo $ECHO_N "checking whether to enable POSIX-like functions... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable POSIX-like functions" >&5
+$as_echo_n "checking whether to enable POSIX-like functions... " >&6; }
 # Check whether --enable-posix was given.
-if test "${enable_posix+set}" = set; then
+if test "${enable_posix+set}" = set; then :
   enableval=$enable_posix; PHP_POSIX=$enableval
 else
 
@@ -100474,17 +79582,15 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_POSIX" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_POSIX 1
-_ACEOF
+$as_echo "#define HAVE_POSIX 1" >>confdefs.h
 
 
   ext_builddir=ext/posix
@@ -100780,140 +79886,12 @@ EOF
   fi
 
 
-
-for ac_header in sys/mkdev.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  for ac_header in sys/mkdev.h
+do :
+  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" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_SYS_MKDEV_H 1
 _ACEOF
 
 fi
@@ -100921,129 +79899,29 @@ fi
 done
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+  for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r
+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"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
-  { echo "$as_me:$LINENO: checking for working ttyname_r() implementation" >&5
-echo $ECHO_N "checking for working ttyname_r() implementation... $ECHO_C" >&6; }
-  if test "$cross_compiling" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working ttyname_r() implementation" >&5
+$as_echo_n "checking for working ttyname_r() implementation... " >&6; }
+  if test "$cross_compiling" = yes; then :
 
-    { echo "$as_me:$LINENO: result: no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" >&5
-echo "${ECHO_T}no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" >&5
+$as_echo "no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" >&6; }
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <unistd.h>
@@ -101056,62 +79934,32 @@ int main(int argc, char *argv[])
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_TTYNAME_R 1
-_ACEOF
+$as_echo "#define HAVE_TTYNAME_R 1" >>confdefs.h
 
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
-    { echo "$as_me:$LINENO: result: no, posix_ttyname() will be thread-unsafe" >&5
-echo "${ECHO_T}no, posix_ttyname() will be thread-unsafe" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, posix_ttyname() will be thread-unsafe" >&5
+$as_echo "no, posix_ttyname() will be thread-unsafe" >&6; }
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
-
-  { echo "$as_me:$LINENO: checking for utsname.domainname" >&5
-echo $ECHO_N "checking for utsname.domainname... $ECHO_C" >&6; }
-if test "${ac_cv_have_utsname_domainname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utsname.domainname" >&5
+$as_echo_n "checking for utsname.domainname... " >&6; }
+if test "${ac_cv_have_utsname_domainname+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
       #define _GNU_SOURCE
@@ -101127,45 +79975,23 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
       ac_cv_have_utsname_domainname=yes
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
       ac_cv_have_utsname_domainname=no
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_utsname_domainname" >&5
-echo "${ECHO_T}$ac_cv_have_utsname_domainname" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_utsname_domainname" >&5
+$as_echo "$ac_cv_have_utsname_domainname" >&6; }
   if test "$ac_cv_have_utsname_domainname" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UTSNAME_DOMAINNAME 1
-_ACEOF
+$as_echo "#define HAVE_UTSNAME_DOMAINNAME 1" >>confdefs.h
 
   fi
 fi
@@ -101174,11 +80000,11 @@ fi
 
 php_with_pspell=no
 
-{ echo "$as_me:$LINENO: checking for PSPELL support" >&5
-echo $ECHO_N "checking for PSPELL support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PSPELL support" >&5
+$as_echo_n "checking for PSPELL support... " >&6; }
 
 # Check whether --with-pspell was given.
-if test "${with_pspell+set}" = set; then
+if test "${with_pspell+set}" = set; then :
   withval=$with_pspell; PHP_PSPELL=$withval
 else
 
@@ -101210,8 +80036,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -101526,9 +80352,7 @@ EOF
 	done
 
 	if test -z "$PSPELL_DIR"; then
-		{ { echo "$as_me:$LINENO: error: Cannot find pspell" >&5
-echo "$as_me: error: Cannot find pspell" >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error "Cannot find pspell" "$LINENO" 5
 	fi
 
 	PSPELL_LIBDIR=$PSPELL_DIR/$PHP_LIBDIR
@@ -101545,10 +80369,10 @@ echo "$as_me: error: Cannot find pspell" >&2;}
     ai_p=$PSPELL_LIBDIR
   else
 
-    ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PSPELL_LIBDIR"`
   fi
 
 
@@ -101588,10 +80412,10 @@ echo "$as_me: error: Cannot find pspell" >&2;}
     ai_p=$PSPELL_LIBDIR
   else
 
-    ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PSPELL_LIBDIR"`
   fi
 
 
@@ -101693,10 +80517,10 @@ echo "$as_me: error: Cannot find pspell" >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -101728,18 +80552,14 @@ echo "$as_me: error: Cannot find pspell" >&2;}
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for new_aspell_config in -laspell" >&5
-echo $ECHO_N "checking for new_aspell_config in -laspell... $ECHO_C" >&6; }
-if test "${ac_cv_lib_aspell_new_aspell_config+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for new_aspell_config in -laspell" >&5
+$as_echo_n "checking for new_aspell_config in -laspell... " >&6; }
+if test "${ac_cv_lib_aspell_new_aspell_config+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-laspell  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -101757,39 +80577,18 @@ return new_aspell_config ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_aspell_new_aspell_config=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_aspell_new_aspell_config=no
+  ac_cv_lib_aspell_new_aspell_config=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_aspell_new_aspell_config" >&5
-echo "${ECHO_T}$ac_cv_lib_aspell_new_aspell_config" >&6; }
-if test $ac_cv_lib_aspell_new_aspell_config = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aspell_new_aspell_config" >&5
+$as_echo "$ac_cv_lib_aspell_new_aspell_config" >&6; }
+if test "x$ac_cv_lib_aspell_new_aspell_config" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -101806,10 +80605,10 @@ if test $ac_cv_lib_aspell_new_aspell_config = yes; then
     ai_p=$PSPELL_LIBDIR
   else
 
-    ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PSPELL_LIBDIR"`
   fi
 
 
@@ -101849,10 +80648,10 @@ if test $ac_cv_lib_aspell_new_aspell_config = yes; then
     ai_p=$PSPELL_LIBDIR
   else
 
-    ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PSPELL_LIBDIR"`
   fi
 
 
@@ -101910,10 +80709,10 @@ fi
     ai_p=$PSPELL_INCDIR
   else
 
-    ep_dir="`echo $PSPELL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PSPELL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PSPELL_INCDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PSPELL_INCDIR"`
   fi
 
 
@@ -101938,9 +80737,7 @@ fi
   PHP_VAR_SUBST="$PHP_VAR_SUBST PSPELL_SHARED_LIBADD"
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PSPELL 1
-_ACEOF
+$as_echo "#define HAVE_PSPELL 1" >>confdefs.h
 
 fi
 
@@ -101948,11 +80745,11 @@ fi
 
 php_with_libedit=no
 
-{ echo "$as_me:$LINENO: checking for libedit readline replacement" >&5
-echo $ECHO_N "checking for libedit readline replacement... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libedit readline replacement" >&5
+$as_echo_n "checking for libedit readline replacement... " >&6; }
 
 # Check whether --with-libedit was given.
-if test "${with_libedit+set}" = set; then
+if test "${with_libedit+set}" = set; then :
   withval=$with_libedit; PHP_LIBEDIT=$withval
 else
 
@@ -101984,8 +80781,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -101994,11 +80791,11 @@ if test "$PHP_LIBEDIT" = "no"; then
 
 php_with_readline=no
 
-{ echo "$as_me:$LINENO: checking for readline support" >&5
-echo $ECHO_N "checking for readline support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline support" >&5
+$as_echo_n "checking for readline support... " >&6; }
 
 # Check whether --with-readline was given.
-if test "${with_readline+set}" = set; then
+if test "${with_readline+set}" = set; then :
   withval=$with_readline; PHP_READLINE=$withval
 else
 
@@ -102030,8 +80827,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -102045,9 +80842,7 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
   done
 
   if test -z "$READLINE_DIR"; then
-    { { echo "$as_me:$LINENO: error: Please reinstall readline - I cannot find readline.h" >&5
-echo "$as_me: error: Please reinstall readline - I cannot find readline.h" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Please reinstall readline - I cannot find readline.h" "$LINENO" 5
   fi
 
 
@@ -102057,10 +80852,10 @@ echo "$as_me: error: Please reinstall readline - I cannot find readline.h" >&2;}
     ai_p=$READLINE_DIR/include
   else
 
-    ep_dir="`echo $READLINE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $READLINE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$READLINE_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$READLINE_DIR/include"`
   fi
 
 
@@ -102083,18 +80878,14 @@ echo "$as_me: error: Please reinstall readline - I cannot find readline.h" >&2;}
 
 
   PHP_READLINE_LIBS=""
-  { echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5
-echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6; }
-if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
+$as_echo_n "checking for tgetent in -lncurses... " >&6; }
+if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lncurses  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -102112,39 +80903,18 @@ return tgetent ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ncurses_tgetent=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_ncurses_tgetent=no
+  ac_cv_lib_ncurses_tgetent=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5
-echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6; }
-if test $ac_cv_lib_ncurses_tgetent = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
+$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
+if test "x$ac_cv_lib_ncurses_tgetent" = x""yes; then :
 
 
 
@@ -102173,18 +80943,14 @@ if test $ac_cv_lib_ncurses_tgetent = yes; then
 
 else
 
-    { echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5
-echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6; }
-if test "${ac_cv_lib_termcap_tgetent+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
+$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
+if test "${ac_cv_lib_termcap_tgetent+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -102202,39 +80968,18 @@ return tgetent ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_termcap_tgetent=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_termcap_tgetent=no
+  ac_cv_lib_termcap_tgetent=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5
-echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6; }
-if test $ac_cv_lib_termcap_tgetent = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
+$as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
+if test "x$ac_cv_lib_termcap_tgetent" = x""yes; then :
 
 
 
@@ -102329,10 +81074,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -102364,18 +81109,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
-echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; }
-if test "${ac_cv_lib_readline_readline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+$as_echo_n "checking for readline in -lreadline... " >&6; }
+if test "${ac_cv_lib_readline_readline+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -102393,39 +81134,18 @@ return readline ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_readline_readline=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_readline_readline=no
+  ac_cv_lib_readline_readline=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6; }
-if test $ac_cv_lib_readline_readline = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
+$as_echo "$ac_cv_lib_readline_readline" >&6; }
+if test "x$ac_cv_lib_readline_readline" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -102442,10 +81162,10 @@ if test $ac_cv_lib_readline_readline = yes; then
     ai_p=$READLINE_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$READLINE_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -102485,10 +81205,10 @@ if test $ac_cv_lib_readline_readline = yes; then
     ai_p=$READLINE_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$READLINE_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -102535,9 +81255,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_readline_readline
 
-    { { echo "$as_me:$LINENO: error: readline library not found" >&5
-echo "$as_me: error: readline library not found" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "readline library not found" "$LINENO" 5
 
 
 fi
@@ -102605,10 +81323,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -102640,18 +81358,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for rl_pending_input in -lreadline" >&5
-echo $ECHO_N "checking for rl_pending_input in -lreadline... $ECHO_C" >&6; }
-if test "${ac_cv_lib_readline_rl_pending_input+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_pending_input in -lreadline" >&5
+$as_echo_n "checking for rl_pending_input in -lreadline... " >&6; }
+if test "${ac_cv_lib_readline_rl_pending_input+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -102669,39 +81383,18 @@ return rl_pending_input ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_readline_rl_pending_input=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_readline_rl_pending_input=no
+  ac_cv_lib_readline_rl_pending_input=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_pending_input" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_rl_pending_input" >&6; }
-if test $ac_cv_lib_readline_rl_pending_input = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_pending_input" >&5
+$as_echo "$ac_cv_lib_readline_rl_pending_input" >&6; }
+if test "x$ac_cv_lib_readline_rl_pending_input" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -102713,9 +81406,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_readline_rl_pending_input
 
-    { { echo "$as_me:$LINENO: error: invalid readline installation detected. Try --with-libedit instead." >&5
-echo "$as_me: error: invalid readline installation detected. Try --with-libedit instead." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "invalid readline installation detected. Try --with-libedit instead." "$LINENO" 5
 
 
 fi
@@ -102783,10 +81474,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -102818,18 +81509,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for rl_callback_read_char in -lreadline" >&5
-echo $ECHO_N "checking for rl_callback_read_char in -lreadline... $ECHO_C" >&6; }
-if test "${ac_cv_lib_readline_rl_callback_read_char+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -lreadline" >&5
+$as_echo_n "checking for rl_callback_read_char in -lreadline... " >&6; }
+if test "${ac_cv_lib_readline_rl_callback_read_char+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -102847,47 +81534,24 @@ return rl_callback_read_char ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_readline_rl_callback_read_char=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_readline_rl_callback_read_char=no
+  ac_cv_lib_readline_rl_callback_read_char=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_callback_read_char" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_rl_callback_read_char" >&6; }
-if test $ac_cv_lib_readline_rl_callback_read_char = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_read_char" >&5
+$as_echo "$ac_cv_lib_readline_rl_callback_read_char" >&6; }
+if test "x$ac_cv_lib_readline_rl_callback_read_char" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_RL_CALLBACK_READ_CHAR 1
-_ACEOF
+$as_echo "#define HAVE_RL_CALLBACK_READ_CHAR 1" >>confdefs.h
 
 
 
@@ -102963,10 +81627,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -102998,18 +81662,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for rl_on_new_line in -ledit" >&5
-echo $ECHO_N "checking for rl_on_new_line in -ledit... $ECHO_C" >&6; }
-if test "${ac_cv_lib_edit_rl_on_new_line+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_on_new_line in -ledit" >&5
+$as_echo_n "checking for rl_on_new_line in -ledit... " >&6; }
+if test "${ac_cv_lib_edit_rl_on_new_line+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -103027,47 +81687,24 @@ return rl_on_new_line ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_edit_rl_on_new_line=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_edit_rl_on_new_line=no
+  ac_cv_lib_edit_rl_on_new_line=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_edit_rl_on_new_line" >&5
-echo "${ECHO_T}$ac_cv_lib_edit_rl_on_new_line" >&6; }
-if test $ac_cv_lib_edit_rl_on_new_line = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_on_new_line" >&5
+$as_echo "$ac_cv_lib_edit_rl_on_new_line" >&6; }
+if test "x$ac_cv_lib_edit_rl_on_new_line" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_RL_ON_NEW_LINE 1
-_ACEOF
+$as_echo "#define HAVE_RL_ON_NEW_LINE 1" >>confdefs.h
 
 
 
@@ -103082,9 +81719,7 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBREADLINE 1
-_ACEOF
+$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
 
 
 elif test "$PHP_LIBEDIT" != "no"; then
@@ -103094,9 +81729,7 @@ elif test "$PHP_LIBEDIT" != "no"; then
   done
 
   if test -z "$LIBEDIT_DIR"; then
-    { { echo "$as_me:$LINENO: error: Please reinstall libedit - I cannot find readline.h" >&5
-echo "$as_me: error: Please reinstall libedit - I cannot find readline.h" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Please reinstall libedit - I cannot find readline.h" "$LINENO" 5
   fi
 
 
@@ -103106,10 +81739,10 @@ echo "$as_me: error: Please reinstall libedit - I cannot find readline.h" >&2;}
     ai_p=$LIBEDIT_DIR/include
   else
 
-    ep_dir="`echo $LIBEDIT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LIBEDIT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LIBEDIT_DIR/include"`
   fi
 
 
@@ -103131,18 +81764,14 @@ echo "$as_me: error: Please reinstall libedit - I cannot find readline.h" >&2;}
   fi
 
 
-  { echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5
-echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6; }
-if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
+$as_echo_n "checking for tgetent in -lncurses... " >&6; }
+if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lncurses  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -103160,39 +81789,18 @@ return tgetent ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ncurses_tgetent=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_ncurses_tgetent=no
+  ac_cv_lib_ncurses_tgetent=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5
-echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6; }
-if test $ac_cv_lib_ncurses_tgetent = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
+$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
+if test "x$ac_cv_lib_ncurses_tgetent" = x""yes; then :
 
 
 
@@ -103220,18 +81828,14 @@ if test $ac_cv_lib_ncurses_tgetent = yes; then
 
 else
 
-    { echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5
-echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6; }
-if test "${ac_cv_lib_termcap_tgetent+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
+$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
+if test "${ac_cv_lib_termcap_tgetent+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -103249,39 +81853,18 @@ return tgetent ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_termcap_tgetent=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_termcap_tgetent=no
+  ac_cv_lib_termcap_tgetent=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5
-echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6; }
-if test $ac_cv_lib_termcap_tgetent = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
+$as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
+if test "x$ac_cv_lib_termcap_tgetent" = x""yes; then :
 
 
 
@@ -103375,10 +81958,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -103410,18 +81993,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for readline in -ledit" >&5
-echo $ECHO_N "checking for readline in -ledit... $ECHO_C" >&6; }
-if test "${ac_cv_lib_edit_readline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5
+$as_echo_n "checking for readline in -ledit... " >&6; }
+if test "${ac_cv_lib_edit_readline+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -103439,39 +82018,18 @@ return readline ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_edit_readline=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_edit_readline=no
+  ac_cv_lib_edit_readline=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_edit_readline" >&5
-echo "${ECHO_T}$ac_cv_lib_edit_readline" >&6; }
-if test $ac_cv_lib_edit_readline = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5
+$as_echo "$ac_cv_lib_edit_readline" >&6; }
+if test "x$ac_cv_lib_edit_readline" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -103488,10 +82046,10 @@ if test $ac_cv_lib_edit_readline = yes; then
     ai_p=$LIBEDIT_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LIBEDIT_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -103531,10 +82089,10 @@ if test $ac_cv_lib_edit_readline = yes; then
     ai_p=$LIBEDIT_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$LIBEDIT_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -103581,9 +82139,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_edit_readline
 
-    { { echo "$as_me:$LINENO: error: edit library required by readline not found" >&5
-echo "$as_me: error: edit library required by readline not found" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "edit library required by readline not found" "$LINENO" 5
 
 
 fi
@@ -103651,10 +82207,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -103686,18 +82242,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for rl_callback_read_char in -ledit" >&5
-echo $ECHO_N "checking for rl_callback_read_char in -ledit... $ECHO_C" >&6; }
-if test "${ac_cv_lib_edit_rl_callback_read_char+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -ledit" >&5
+$as_echo_n "checking for rl_callback_read_char in -ledit... " >&6; }
+if test "${ac_cv_lib_edit_rl_callback_read_char+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -103715,47 +82267,24 @@ return rl_callback_read_char ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_edit_rl_callback_read_char=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_edit_rl_callback_read_char=no
+  ac_cv_lib_edit_rl_callback_read_char=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_edit_rl_callback_read_char" >&5
-echo "${ECHO_T}$ac_cv_lib_edit_rl_callback_read_char" >&6; }
-if test $ac_cv_lib_edit_rl_callback_read_char = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_callback_read_char" >&5
+$as_echo "$ac_cv_lib_edit_rl_callback_read_char" >&6; }
+if test "x$ac_cv_lib_edit_rl_callback_read_char" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_RL_CALLBACK_READ_CHAR 1
-_ACEOF
+$as_echo "#define HAVE_RL_CALLBACK_READ_CHAR 1" >>confdefs.h
 
 
 
@@ -103831,10 +82360,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -103866,18 +82395,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for rl_on_new_line in -ledit" >&5
-echo $ECHO_N "checking for rl_on_new_line in -ledit... $ECHO_C" >&6; }
-if test "${ac_cv_lib_edit_rl_on_new_line+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_on_new_line in -ledit" >&5
+$as_echo_n "checking for rl_on_new_line in -ledit... " >&6; }
+if test "${ac_cv_lib_edit_rl_on_new_line+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -103895,47 +82420,24 @@ return rl_on_new_line ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_edit_rl_on_new_line=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_edit_rl_on_new_line=no
+  ac_cv_lib_edit_rl_on_new_line=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_edit_rl_on_new_line" >&5
-echo "${ECHO_T}$ac_cv_lib_edit_rl_on_new_line" >&6; }
-if test $ac_cv_lib_edit_rl_on_new_line = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_on_new_line" >&5
+$as_echo "$ac_cv_lib_edit_rl_on_new_line" >&6; }
+if test "x$ac_cv_lib_edit_rl_on_new_line" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_RL_ON_NEW_LINE 1
-_ACEOF
+$as_echo "#define HAVE_RL_ON_NEW_LINE 1" >>confdefs.h
 
 
 
@@ -103950,102 +82452,17 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBEDIT 1
-_ACEOF
+$as_echo "#define HAVE_LIBEDIT 1" >>confdefs.h
 
 fi
 
 if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then
-
-for ac_func in rl_completion_matches
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+  for ac_func in rl_completion_matches
+do :
+  ac_fn_c_check_func "$LINENO" "rl_completion_matches" "ac_cv_func_rl_completion_matches"
+if test "x$ac_cv_func_rl_completion_matches" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_RL_COMPLETION_MATCHES 1
 _ACEOF
 
 fi
@@ -104353,11 +82770,11 @@ fi
 
 php_with_recode=no
 
-{ echo "$as_me:$LINENO: checking for recode support" >&5
-echo $ECHO_N "checking for recode support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for recode support" >&5
+$as_echo_n "checking for recode support... " >&6; }
 
 # Check whether --with-recode was given.
-if test "${with_recode+set}" = set; then
+if test "${with_recode+set}" = set; then :
   withval=$with_recode; PHP_RECODE=$withval
 else
 
@@ -104389,8 +82806,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -104418,9 +82835,7 @@ if test "$PHP_RECODE" != "no"; then
   done
 
   if test -z "$RECODE_DIR"; then
-    { { echo "$as_me:$LINENO: error: Can not find recode.h anywhere under $RECODE_LIST." >&5
-echo "$as_me: error: Can not find recode.h anywhere under $RECODE_LIST." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Can not find recode.h anywhere under $RECODE_LIST." "$LINENO" 5
   fi
 
 
@@ -104485,10 +82900,10 @@ echo "$as_me: error: Can not find recode.h anywhere under $RECODE_LIST." >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -104520,18 +82935,14 @@ echo "$as_me: error: Can not find recode.h anywhere under $RECODE_LIST." >&2;}
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for recode_format_table in -lrecode" >&5
-echo $ECHO_N "checking for recode_format_table in -lrecode... $ECHO_C" >&6; }
-if test "${ac_cv_lib_recode_recode_format_table+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for recode_format_table in -lrecode" >&5
+$as_echo_n "checking for recode_format_table in -lrecode... " >&6; }
+if test "${ac_cv_lib_recode_recode_format_table+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrecode  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -104549,39 +82960,18 @@ return recode_format_table ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_recode_recode_format_table=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_recode_recode_format_table=no
+  ac_cv_lib_recode_recode_format_table=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_recode_recode_format_table" >&5
-echo "${ECHO_T}$ac_cv_lib_recode_recode_format_table" >&6; }
-if test $ac_cv_lib_recode_recode_format_table = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_recode_recode_format_table" >&5
+$as_echo "$ac_cv_lib_recode_recode_format_table" >&6; }
+if test "x$ac_cv_lib_recode_recode_format_table" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -104598,10 +82988,10 @@ if test $ac_cv_lib_recode_recode_format_table = yes; then
     ai_p=$RECODE_DIR/$RECODE_LIB
   else
 
-    ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$RECODE_DIR/$RECODE_LIB"`
   fi
 
 
@@ -104641,10 +83031,10 @@ if test $ac_cv_lib_recode_recode_format_table = yes; then
     ai_p=$RECODE_DIR/$RECODE_LIB
   else
 
-    ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$RECODE_DIR/$RECODE_LIB"`
   fi
 
 
@@ -104695,11 +83085,7 @@ else
     old_LIBS=$LIBS
     LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB"
     LIBS="$LIBS -lrecode"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 char *program_name;
@@ -104714,24 +83100,7 @@ recode_format_table();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
 
 
 
@@ -104745,10 +83114,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
     ai_p=$RECODE_DIR/$RECODE_LIB
   else
 
-    ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$RECODE_DIR/$RECODE_LIB"`
   fi
 
 
@@ -104788,10 +83157,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
     ai_p=$RECODE_DIR/$RECODE_LIB
   else
 
-    ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$RECODE_DIR/$RECODE_LIB"`
   fi
 
 
@@ -104831,24 +83200,16 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BROKEN_RECODE 1
-_ACEOF
+$as_echo "#define HAVE_BROKEN_RECODE 1" >>confdefs.h
 
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
-      { { echo "$as_me:$LINENO: error: I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" >&5
-echo "$as_me: error: I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" "$LINENO" 5
 
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
     LIBS=$old_LIBS
     LDFLAGS=$old_LDFLAGS
 
@@ -104857,9 +83218,7 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBRECODE 1
-_ACEOF
+$as_echo "#define HAVE_LIBRECODE 1" >>confdefs.h
 
 
   if test "$RECODE_DIR/$RECODE_INC" != "/usr/include"; then
@@ -104868,10 +83227,10 @@ _ACEOF
     ai_p=$RECODE_DIR/$RECODE_INC
   else
 
-    ep_dir="`echo $RECODE_DIR/$RECODE_INC|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $RECODE_DIR/$RECODE_INC|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_INC\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$RECODE_DIR/$RECODE_INC"`
   fi
 
 
@@ -104895,140 +83254,12 @@ _ACEOF
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST RECODE_SHARED_LIBADD"
 
-
-for ac_header in stdbool.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  for ac_header in stdbool.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "stdbool.h" "ac_cv_header_stdbool_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdbool_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_STDBOOL_H 1
 _ACEOF
 
 fi
@@ -105332,9 +83563,7 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_REFLECTION 1
-_ACEOF
+$as_echo "#define HAVE_REFLECTION 1" >>confdefs.h
 
 
   ext_builddir=ext/reflection
@@ -105634,10 +83863,10 @@ EOF
 
 php_enable_session=yes
 
-{ echo "$as_me:$LINENO: checking whether to enable PHP sessions" >&5
-echo $ECHO_N "checking whether to enable PHP sessions... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable PHP sessions" >&5
+$as_echo_n "checking whether to enable PHP sessions... " >&6; }
 # Check whether --enable-session was given.
-if test "${enable_session+set}" = set; then
+if test "${enable_session+set}" = set; then :
   enableval=$enable_session; PHP_SESSION=$enableval
 else
 
@@ -105669,8 +83898,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -105678,11 +83907,11 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_with_mm=no
 
-{ echo "$as_me:$LINENO: checking for mm support" >&5
-echo $ECHO_N "checking for mm support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mm support" >&5
+$as_echo_n "checking for mm support... " >&6; }
 
 # Check whether --with-mm was given.
-if test "${with_mm+set}" = set; then
+if test "${with_mm+set}" = set; then :
   withval=$with_mm; PHP_MM=$withval
 else
 
@@ -105693,31 +83922,27 @@ fi
 
 
 ext_output=$PHP_MM
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_SESSION" != "no"; then
 
-  { echo "$as_me:$LINENO: checking whether pwrite works" >&5
-echo $ECHO_N "checking whether pwrite works... $ECHO_C" >&6; }
-if test "${ac_cv_pwrite+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pwrite works" >&5
+$as_echo_n "checking whether pwrite works... " >&6; }
+if test "${ac_cv_pwrite+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
     ac_cv_pwrite=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -105738,56 +83963,28 @@ cat >>conftest.$ac_ext <<_ACEOF
 
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_pwrite=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     ac_cv_pwrite=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
-
     if test "$ac_cv_pwrite" = "no"; then
 
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
     ac_cv_pwrite=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -105808,87 +84005,55 @@ ssize_t pwrite(int, void *, size_t, off64_t);
 
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_pwrite=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     ac_cv_pwrite=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
-
       if test "$ac_cv_pwrite" = "yes"; then
         ac_cv_pwrite=64
       fi
     fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_pwrite" >&5
-echo "${ECHO_T}$ac_cv_pwrite" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pwrite" >&5
+$as_echo "$ac_cv_pwrite" >&6; }
 
   if test "$ac_cv_pwrite" != "no"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PWRITE 1
-_ACEOF
+$as_echo "#define HAVE_PWRITE 1" >>confdefs.h
 
     if test "$ac_cv_pwrite" = "64"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define PHP_PWRITE_64 1
-_ACEOF
+$as_echo "#define PHP_PWRITE_64 1" >>confdefs.h
 
     fi
   fi
 
 
-  { echo "$as_me:$LINENO: checking whether pread works" >&5
-echo $ECHO_N "checking whether pread works... $ECHO_C" >&6; }
-if test "${ac_cv_pread+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pread works" >&5
+$as_echo_n "checking whether pread works... " >&6; }
+if test "${ac_cv_pread+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 
   echo test > conftest_in
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
     ac_cv_pread=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -105908,58 +84073,30 @@ cat >>conftest.$ac_ext <<_ACEOF
     }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_pread=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     ac_cv_pread=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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 conftest_in
 
     if test "$ac_cv_pread" = "no"; then
 
   echo test > conftest_in
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
     ac_cv_pread=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -105979,43 +84116,19 @@ ssize_t pread(int, void *, size_t, off64_t);
     }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_pread=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     ac_cv_pread=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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 conftest_in
 
       if test "$ac_cv_pread" = "yes"; then
@@ -106024,20 +84137,16 @@ fi
     fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_pread" >&5
-echo "${ECHO_T}$ac_cv_pread" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pread" >&5
+$as_echo "$ac_cv_pread" >&6; }
 
   if test "$ac_cv_pread" != "no"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PREAD 1
-_ACEOF
+$as_echo "#define HAVE_PREAD 1" >>confdefs.h
 
     if test "$ac_cv_pread" = "64"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define PHP_PREAD_64 1
-_ACEOF
+$as_echo "#define PHP_PREAD_64 1" >>confdefs.h
 
     fi
   fi
@@ -106340,30 +84449,18 @@ EOF
   is_it_shared=$PHP_HASH_SHARED
   is_it_enabled=$PHP_HASH
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension session to build statically, but it
-depends on extension hash, which you've configured to build shared.
-You either need to build session shared or build hash statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension session to build statically, but it
 depends on extension hash, which you've configured to build shared.
 You either need to build session shared or build hash statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension session, which depends on extension hash,
 but you've either not enabled hash, or have disabled it.
-" >&5
-echo "$as_me: error:
-You've configured extension session, which depends on extension hash,
-but you've either not enabled hash, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 
@@ -106371,30 +84468,18 @@ but you've either not enabled hash, or have disabled it.
   is_it_shared=$PHP_SPL_SHARED
   is_it_enabled=$PHP_SPL
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension session to build statically, but it
-depends on extension spl, which you've configured to build shared.
-You either need to build session shared or build spl statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension session to build statically, but it
 depends on extension spl, which you've configured to build shared.
 You either need to build session shared or build spl statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension session, which depends on extension spl,
-but you've either not enabled spl, or have disabled it.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension session, which depends on extension spl,
 but you've either not enabled spl, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 
@@ -106421,9 +84506,7 @@ but you've either not enabled spl, or have disabled it.
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PHP_SESSION 1
-_ACEOF
+$as_echo "#define HAVE_PHP_SESSION 1" >>confdefs.h
 
 fi
 
@@ -106433,9 +84516,7 @@ if test "$PHP_MM" != "no"; then
   done
 
   if test -z "$MM_DIR" ; then
-    { { echo "$as_me:$LINENO: error: cannot find mm library" >&5
-echo "$as_me: error: cannot find mm library" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "cannot find mm library" "$LINENO" 5
   fi
 
 
@@ -106450,10 +84531,10 @@ echo "$as_me: error: cannot find mm library" >&2;}
     ai_p=$MM_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$MM_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -106493,10 +84574,10 @@ echo "$as_me: error: cannot find mm library" >&2;}
     ai_p=$MM_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$MM_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -106542,10 +84623,10 @@ echo "$as_me: error: cannot find mm library" >&2;}
     ai_p=$MM_DIR/include
   else
 
-    ep_dir="`echo $MM_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $MM_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$MM_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$MM_DIR/include"`
   fi
 
 
@@ -106585,19 +84666,17 @@ echo "$as_me: error: cannot find mm library" >&2;}
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBMM 1
-_ACEOF
+$as_echo "#define HAVE_LIBMM 1" >>confdefs.h
 
 fi
 
 
 php_enable_shmop=no
 
-{ echo "$as_me:$LINENO: checking whether to enable shmop support" >&5
-echo $ECHO_N "checking whether to enable shmop support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable shmop support" >&5
+$as_echo_n "checking whether to enable shmop support... " >&6; }
 # Check whether --enable-shmop was given.
-if test "${enable_shmop+set}" = set; then
+if test "${enable_shmop+set}" = set; then :
   enableval=$enable_shmop; PHP_SHMOP=$enableval
 else
 
@@ -106629,17 +84708,15 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_SHMOP" != "no"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SHMOP 1
-_ACEOF
+$as_echo "#define HAVE_SHMOP 1" >>confdefs.h
 
 
   ext_builddir=ext/shmop
@@ -106940,10 +85017,10 @@ fi
 
 php_enable_simplexml=yes
 
-{ echo "$as_me:$LINENO: checking whether to enable SimpleXML support" >&5
-echo $ECHO_N "checking whether to enable SimpleXML support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable SimpleXML support" >&5
+$as_echo_n "checking whether to enable SimpleXML support... " >&6; }
 # Check whether --enable-simplexml was given.
-if test "${enable_simplexml+set}" = set; then
+if test "${enable_simplexml+set}" = set; then :
   enableval=$enable_simplexml; PHP_SIMPLEXML=$enableval
 else
 
@@ -106975,8 +85052,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -106985,11 +85062,11 @@ if test -z "$PHP_LIBXML_DIR"; then
 
 php_with_libxml_dir=no
 
-{ echo "$as_me:$LINENO: checking libxml2 install dir" >&5
-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml2 install dir" >&5
+$as_echo_n "checking libxml2 install dir... " >&6; }
 
 # Check whether --with-libxml-dir was given.
-if test "${with_libxml_dir+set}" = set; then
+if test "${with_libxml_dir+set}" = set; then :
   withval=$with_libxml_dir; PHP_LIBXML_DIR=$withval
 else
 
@@ -107000,8 +85077,8 @@ fi
 
 
 ext_output=$PHP_LIBXML_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -107010,16 +85087,14 @@ fi
 if test "$PHP_SIMPLEXML" != "no"; then
 
   if test "$PHP_LIBXML" = "no"; then
-    { { echo "$as_me:$LINENO: error: SimpleXML extension requires LIBXML extension, add --enable-libxml" >&5
-echo "$as_me: error: SimpleXML extension requires LIBXML extension, add --enable-libxml" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "SimpleXML extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5
   fi
 
 
-{ echo "$as_me:$LINENO: checking for xml2-config path" >&5
-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6; }
-if test "${ac_cv_php_xml2_config_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5
+$as_echo_n "checking for xml2-config path... " >&6; }
+if test "${ac_cv_php_xml2_config_path+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
   for i in $PHP_LIBXML_DIR /usr/local /usr; do
@@ -107030,8 +85105,8 @@ else
   done
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5
-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_xml2_config_path" >&5
+$as_echo "$ac_cv_php_xml2_config_path" >&6; }
 
   if test -x "$ac_cv_php_xml2_config_path"; then
     XML2_CONFIG="$ac_cv_php_xml2_config_path"
@@ -107098,10 +85173,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -107145,10 +85220,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -107174,10 +85249,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
   done
 
 
-            { echo "$as_me:$LINENO: checking whether libxml build works" >&5
-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6; }
-if test "${php_cv_libxml_build_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5
+$as_echo_n "checking whether libxml build works... " >&6; }
+if test "${php_cv_libxml_build_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -107185,16 +85260,12 @@ else
   LIBS="
           $SIMPLEXML_SHARED_LIBADD
          $LIBS"
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
     LIBS=$old_LIBS
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -107205,26 +85276,7 @@ cat >>conftest.$ac_ext <<_ACEOF
     }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     LIBS=$old_LIBS
 
@@ -107232,43 +85284,32 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     LIBS=$old_LIBS
 
-          { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-          { { echo "$as_me:$LINENO: error: build test failed.  Please check the config.log for details." >&5
-echo "$as_me: error: build test failed.  Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          as_fn_error "build test failed.  Please check the config.log for details." "$LINENO" 5
 
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
 
-
 fi
-{ echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5
-echo "${ECHO_T}$php_cv_libxml_build_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_libxml_build_works" >&5
+$as_echo "$php_cv_libxml_build_works" >&6; }
       if test "$php_cv_libxml_build_works" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBXML 1
-_ACEOF
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
       fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SIMPLEXML 1
-_ACEOF
+$as_echo "#define HAVE_SIMPLEXML 1" >>confdefs.h
 
 
   ext_builddir=ext/simplexml
@@ -107568,14 +85609,10 @@ EOF
 
 
     else
-      { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5
-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "libxml2 version 2.6.11 or greater required." "$LINENO" 5
     fi
 else
-    { { echo "$as_me:$LINENO: error: xml2-config not found. Please check your libxml2 installation." >&5
-echo "$as_me: error: xml2-config not found. Please check your libxml2 installation." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5
 
   fi
 
@@ -107584,30 +85621,18 @@ echo "$as_me: error: xml2-config not found. Please check your libxml2 installati
   is_it_shared=$PHP_LIBXML_SHARED
   is_it_enabled=$PHP_LIBXML
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension simplexml to build statically, but it
 depends on extension libxml, which you've configured to build shared.
 You either need to build simplexml shared or build libxml statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension simplexml to build statically, but it
-depends on extension libxml, which you've configured to build shared.
-You either need to build simplexml shared or build libxml statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension simplexml, which depends on extension libxml,
-but you've either not enabled libxml, or have disabled it.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension simplexml, which depends on extension libxml,
 but you've either not enabled libxml, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 
@@ -107615,30 +85640,18 @@ but you've either not enabled libxml, or have disabled it.
   is_it_shared=$PHP_SPL_SHARED
   is_it_enabled=$PHP_SPL
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension simplexml to build statically, but it
 depends on extension spl, which you've configured to build shared.
 You either need to build simplexml shared or build spl statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension simplexml to build statically, but it
-depends on extension spl, which you've configured to build shared.
-You either need to build simplexml shared or build spl statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension simplexml, which depends on extension spl,
-but you've either not enabled spl, or have disabled it.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension simplexml, which depends on extension spl,
 but you've either not enabled spl, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 fi
@@ -107647,11 +85660,11 @@ fi
 
 php_with_snmp=no
 
-{ echo "$as_me:$LINENO: checking for SNMP support" >&5
-echo $ECHO_N "checking for SNMP support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNMP support" >&5
+$as_echo_n "checking for SNMP support... " >&6; }
 
 # Check whether --with-snmp was given.
-if test "${with_snmp+set}" = set; then
+if test "${with_snmp+set}" = set; then :
   withval=$with_snmp; PHP_SNMP=$withval
 else
 
@@ -107683,8 +85696,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -107692,11 +85705,11 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_with_openssl_dir=no
 
-{ echo "$as_me:$LINENO: checking OpenSSL dir for SNMP" >&5
-echo $ECHO_N "checking OpenSSL dir for SNMP... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenSSL dir for SNMP" >&5
+$as_echo_n "checking OpenSSL dir for SNMP... " >&6; }
 
 # Check whether --with-openssl-dir was given.
-if test "${with_openssl_dir+set}" = set; then
+if test "${with_openssl_dir+set}" = set; then :
   withval=$with_openssl_dir; PHP_OPENSSL_DIR=$withval
 else
 
@@ -107707,8 +85720,8 @@ fi
 
 
 ext_output=$PHP_OPENSSL_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -107718,10 +85731,10 @@ if test "$PHP_SNMP" != "no"; then
   if test "$PHP_SNMP" = "yes"; then
     # Extract the first word of "net-snmp-config", so it can be a program name with args.
 set dummy net-snmp-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_SNMP_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_SNMP_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $SNMP_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -107734,14 +85747,14 @@ for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_SNMP_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -107749,11 +85762,11 @@ esac
 fi
 SNMP_CONFIG=$ac_cv_path_SNMP_CONFIG
 if test -n "$SNMP_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $SNMP_CONFIG" >&5
-echo "${ECHO_T}$SNMP_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SNMP_CONFIG" >&5
+$as_echo "$SNMP_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -107780,10 +85793,10 @@ fi
     ai_p=${SNMP_PREFIX}/include
   else
 
-    ep_dir="`echo $SNMP_PREFIX/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $SNMP_PREFIX/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"${SNMP_PREFIX}/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "${SNMP_PREFIX}/include"`
   fi
 
 
@@ -107858,10 +85871,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -107895,19 +85908,13 @@ fi
 
         SNMP_LIBNAME=netsnmp
       else
-        { { echo "$as_me:$LINENO: error: Could not find the required paths. Please check your net-snmp installation." >&5
-echo "$as_me: error: Could not find the required paths. Please check your net-snmp installation." >&2;}
-   { (exit 1); exit 1; }; }
+        as_fn_error "Could not find the required paths. Please check your net-snmp installation." "$LINENO" 5
       fi
     else
-      { { echo "$as_me:$LINENO: error: Net-SNMP version 5.3 or greater reqired (detected $snmp_full_version)." >&5
-echo "$as_me: error: Net-SNMP version 5.3 or greater reqired (detected $snmp_full_version)." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Net-SNMP version 5.3 or greater reqired (detected $snmp_full_version)." "$LINENO" 5
     fi
   else
-    { { echo "$as_me:$LINENO: error: Could not find net-snmp-config binary. Please check your net-snmp installation." >&5
-echo "$as_me: error: Could not find net-snmp-config binary. Please check your net-snmp installation." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Could not find net-snmp-config binary. Please check your net-snmp installation." "$LINENO" 5
   fi
 
 
@@ -107972,10 +85979,10 @@ echo "$as_me: error: Could not find net-snmp-config binary. Please check your ne
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -108007,19 +86014,15 @@ echo "$as_me: error: Could not find net-snmp-config binary. Please check your ne
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$SNMP_LIBNAME''_init_snmp" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for init_snmp in -l$SNMP_LIBNAME" >&5
-echo $ECHO_N "checking for init_snmp in -l$SNMP_LIBNAME... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$SNMP_LIBNAME''_init_snmp" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for init_snmp in -l$SNMP_LIBNAME" >&5
+$as_echo_n "checking for init_snmp in -l$SNMP_LIBNAME... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$SNMP_LIBNAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -108037,48 +86040,26 @@ return init_snmp ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SNMP 1
-_ACEOF
+$as_echo "#define HAVE_SNMP 1" >>confdefs.h
 
 
 
@@ -108088,9 +86069,7 @@ else
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$SNMP_LIBNAME_init_snmp
 
-    { { echo "$as_me:$LINENO: error: SNMP sanity check failed. Please check config.log for more information." >&5
-echo "$as_me: error: SNMP sanity check failed. Please check config.log for more information." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "SNMP sanity check failed. Please check config.log for more information." "$LINENO" 5
 
 
 fi
@@ -108158,10 +86137,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -108193,19 +86172,15 @@ fi
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$SNMP_LIBNAME''_shutdown_snmp_logging" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for shutdown_snmp_logging in -l$SNMP_LIBNAME" >&5
-echo $ECHO_N "checking for shutdown_snmp_logging in -l$SNMP_LIBNAME... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$SNMP_LIBNAME''_shutdown_snmp_logging" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shutdown_snmp_logging in -l$SNMP_LIBNAME" >&5
+$as_echo_n "checking for shutdown_snmp_logging in -l$SNMP_LIBNAME... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$SNMP_LIBNAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -108223,48 +86198,26 @@ return shutdown_snmp_logging ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SHUTDOWN_SNMP_LOGGING 1
-_ACEOF
+$as_echo "#define HAVE_SHUTDOWN_SNMP_LOGGING 1" >>confdefs.h
 
 
 
@@ -108278,121 +86231,6 @@ else
 fi
 
 
-    { echo "$as_me:$LINENO: checking for buggy snmp_snprint_value" >&5
-echo $ECHO_N "checking for buggy snmp_snprint_value... $ECHO_C" >&6; }
-if test "${ac_cv_buggy_snprint_value+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -I${SNMP_PREFIX}/include $SNMP_SHARED_LIBADD"
-    if test "$cross_compiling" = yes; then
-
-      ac_cv_buggy_snprint_value=no
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <net-snmp/net-snmp-config.h>
-#include <net-snmp/net-snmp-includes.h>
-
-u_char uname[] = "Linux nex1.php.net 2.6.18-194.32.1.el5 #1 SMP Wed Jan 5 17:53:09 EST 2011 i686";
-
-int main(int argc, char **argv)
-{
-	struct variable_list vars;
-	char buf1[2048];
-	char buf2[sizeof(buf1)];
-
-	memset(&(buf1[0]), 0, sizeof(buf1));
-	memset(&(buf2[0]), 0, sizeof(buf2));
-	memset(&vars, 0, sizeof(vars));
-	vars.type = 4;
-	vars.val.integer = (long *)&(uname[0]);
-	vars.val.string = &(uname[0]);
-	vars.val.bitstring = &(uname[0]);
-	vars.val.counter64 = (struct counter64 *)&(uname[0]);
-	vars.val.floatVal = (float *)&(uname[0]);
-	vars.val_len = sizeof(uname),
-	vars.name_loc[0] = 1;
-	vars.name_loc[1] = 3;
-	vars.name_loc[2] = 6;
-	vars.name_loc[3] = 1;
-	vars.name_loc[4] = 2;
-	vars.name_loc[5] = 1;
-	vars.name_loc[6] = 1;
-	vars.name_loc[7] = 1;
-	vars.name = (oid *)&(vars.name_loc);
-	vars.name_length = 9;
-
-	init_snmp("snmpapp");
-
-	netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT, 0);
-
-	snprint_value(buf1, (sizeof(uname) + 32), vars.name, vars.name_length, &vars);
-	snprint_value(buf2, sizeof(buf2), vars.name, vars.name_length, &vars);
-	exit((strncmp(buf1, buf2, sizeof(buf1)) != 0));
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-      ac_cv_buggy_snprint_value=no
-
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-      ac_cv_buggy_snprint_value=yes
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-    CFLAGS="$save_CFLAGS"
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_buggy_snprint_value" >&5
-echo "${ECHO_T}$ac_cv_buggy_snprint_value" >&6; }
-  if test "$ac_cv_buggy_snprint_value" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define BUGGY_SNMPRINT_VALUE 1
-_ACEOF
-
-  fi
-
 
   ext_builddir=ext/snmp
   ext_srcdir=$abs_srcdir/ext/snmp
@@ -108695,10 +86533,10 @@ fi
 
 php_enable_soap=no
 
-{ echo "$as_me:$LINENO: checking whether to enable SOAP support" >&5
-echo $ECHO_N "checking whether to enable SOAP support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable SOAP support" >&5
+$as_echo_n "checking whether to enable SOAP support... " >&6; }
 # Check whether --enable-soap was given.
-if test "${enable_soap+set}" = set; then
+if test "${enable_soap+set}" = set; then :
   enableval=$enable_soap; PHP_SOAP=$enableval
 else
 
@@ -108730,8 +86568,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -108740,11 +86578,11 @@ if test -z "$PHP_LIBXML_DIR"; then
 
 php_with_libxml_dir=no
 
-{ echo "$as_me:$LINENO: checking libxml2 install dir" >&5
-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml2 install dir" >&5
+$as_echo_n "checking libxml2 install dir... " >&6; }
 
 # Check whether --with-libxml-dir was given.
-if test "${with_libxml_dir+set}" = set; then
+if test "${with_libxml_dir+set}" = set; then :
   withval=$with_libxml_dir; PHP_LIBXML_DIR=$withval
 else
 
@@ -108755,8 +86593,8 @@ fi
 
 
 ext_output=$PHP_LIBXML_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -108765,16 +86603,14 @@ fi
 if test "$PHP_SOAP" != "no"; then
 
   if test "$PHP_LIBXML" = "no"; then
-    { { echo "$as_me:$LINENO: error: SOAP extension requires LIBXML extension, add --enable-libxml" >&5
-echo "$as_me: error: SOAP extension requires LIBXML extension, add --enable-libxml" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "SOAP extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5
   fi
 
 
-{ echo "$as_me:$LINENO: checking for xml2-config path" >&5
-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6; }
-if test "${ac_cv_php_xml2_config_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5
+$as_echo_n "checking for xml2-config path... " >&6; }
+if test "${ac_cv_php_xml2_config_path+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
   for i in $PHP_LIBXML_DIR /usr/local /usr; do
@@ -108785,8 +86621,8 @@ else
   done
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5
-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_xml2_config_path" >&5
+$as_echo "$ac_cv_php_xml2_config_path" >&6; }
 
   if test -x "$ac_cv_php_xml2_config_path"; then
     XML2_CONFIG="$ac_cv_php_xml2_config_path"
@@ -108853,10 +86689,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -108900,10 +86736,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -108929,10 +86765,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
   done
 
 
-            { echo "$as_me:$LINENO: checking whether libxml build works" >&5
-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6; }
-if test "${php_cv_libxml_build_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5
+$as_echo_n "checking whether libxml build works... " >&6; }
+if test "${php_cv_libxml_build_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -108940,16 +86776,12 @@ else
   LIBS="
           $SOAP_SHARED_LIBADD
          $LIBS"
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
     LIBS=$old_LIBS
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -108960,26 +86792,7 @@ cat >>conftest.$ac_ext <<_ACEOF
     }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     LIBS=$old_LIBS
 
@@ -108987,43 +86800,32 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     LIBS=$old_LIBS
 
-          { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-          { { echo "$as_me:$LINENO: error: build test failed.  Please check the config.log for details." >&5
-echo "$as_me: error: build test failed.  Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          as_fn_error "build test failed.  Please check the config.log for details." "$LINENO" 5
 
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
 
-
 fi
-{ echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5
-echo "${ECHO_T}$php_cv_libxml_build_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_libxml_build_works" >&5
+$as_echo "$php_cv_libxml_build_works" >&6; }
       if test "$php_cv_libxml_build_works" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBXML 1
-_ACEOF
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
       fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SOAP 1
-_ACEOF
+$as_echo "#define HAVE_SOAP 1" >>confdefs.h
 
 
   ext_builddir=ext/soap
@@ -109323,14 +87125,10 @@ EOF
 
 
     else
-      { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5
-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "libxml2 version 2.6.11 or greater required." "$LINENO" 5
     fi
 else
-    { { echo "$as_me:$LINENO: error: xml2-config not found. Please check your libxml2 installation." >&5
-echo "$as_me: error: xml2-config not found. Please check your libxml2 installation." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5
 
   fi
 
@@ -109340,10 +87138,10 @@ fi
 
 php_enable_sockets=no
 
-{ echo "$as_me:$LINENO: checking whether to enable sockets support" >&5
-echo $ECHO_N "checking whether to enable sockets support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable sockets support" >&5
+$as_echo_n "checking whether to enable sockets support... " >&6; }
 # Check whether --enable-sockets was given.
-if test "${enable_sockets+set}" = set; then
+if test "${enable_sockets+set}" = set; then :
   enableval=$enable_sockets; PHP_SOCKETS=$enableval
 else
 
@@ -109375,24 +87173,20 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_SOCKETS" != "no"; then
-    { echo "$as_me:$LINENO: checking for struct cmsghdr" >&5
-echo $ECHO_N "checking for struct cmsghdr... $ECHO_C" >&6; }
-if test "${ac_cv_cmsghdr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct cmsghdr" >&5
+$as_echo_n "checking for struct cmsghdr... " >&6; }
+if test "${ac_cv_cmsghdr+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -109405,291 +87199,51 @@ struct cmsghdr s; s
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_cmsghdr=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_cmsghdr=no
+  ac_cv_cmsghdr=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cmsghdr" >&5
-echo "${ECHO_T}$ac_cv_cmsghdr" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cmsghdr" >&5
+$as_echo "$ac_cv_cmsghdr" >&6; }
 
   if test "$ac_cv_cmsghdr" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CMSGHDR 1
-_ACEOF
+$as_echo "#define HAVE_CMSGHDR 1" >>confdefs.h
 
   fi
 
-
-
-
-
-for ac_func in hstrerror socketpair if_nametoindex if_indextoname
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+  for ac_func in hstrerror socketpair if_nametoindex if_indextoname
+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"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
-
-
-
-
-
-for ac_header in netdb.h netinet/tcp.h sys/un.h sys/sockio.h errno.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  for ac_header in netdb.h netinet/tcp.h sys/un.h sys/sockio.h errno.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"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -109703,54 +87257,26 @@ static struct msghdr tp; int n = (int) tp.msg_flags; return n
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
+if ac_fn_c_try_compile "$LINENO"; then :
+
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-
-cat >>confdefs.h <<\_ACEOF
-#define MISSING_MSGHDR_MSGFLAGS 1
-_ACEOF
+$as_echo "#define MISSING_MSGHDR_MSGFLAGS 1" >>confdefs.h
 
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SOCKETS 1
-_ACEOF
+$as_echo "#define HAVE_SOCKETS 1" >>confdefs.h
 
 
-    { echo "$as_me:$LINENO: checking for field ss_family in struct sockaddr_storage" >&5
-echo $ECHO_N "checking for field ss_family in struct sockaddr_storage... $ECHO_C" >&6; }
-if test "${ac_cv_ss_family+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for field ss_family in struct sockaddr_storage" >&5
+$as_echo_n "checking for field ss_family in struct sockaddr_storage... " >&6; }
+if test "${ac_cv_ss_family+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/socket.h>
@@ -109765,42 +87291,20 @@ struct sockaddr_storage sa_store; sa_store.ss_family = AF_INET6;
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_ss_family=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_ss_family=no
+  ac_cv_ss_family=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_ss_family" >&5
-echo "${ECHO_T}$ac_cv_ss_family" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ss_family" >&5
+$as_echo "$ac_cv_ss_family" >&6; }
 
   if test "$ac_cv_ss_family" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SA_SS_FAMILY 1
-_ACEOF
+$as_echo "#define HAVE_SA_SS_FAMILY 1" >>confdefs.h
 
   fi
 
@@ -110120,22 +87624,18 @@ EOF
 fi
 
 
-  { echo "$as_me:$LINENO: checking whether zend_object_value is packed" >&5
-echo $ECHO_N "checking whether zend_object_value is packed... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether zend_object_value is packed" >&5
+$as_echo_n "checking whether zend_object_value is packed... " >&6; }
   old_CPPFLAGS=$CPPFLAGS
   CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS"
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
     ac_result=0
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include "Zend/zend_types.h"
@@ -110144,47 +87644,23 @@ int main(int argc, char **argv) {
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_result=1
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     ac_result=0
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
   CPPFLAGS=$old_CPPFLAGS
 
 cat >>confdefs.h <<_ACEOF
@@ -110192,9 +87668,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SPL 1
-_ACEOF
+$as_echo "#define HAVE_SPL 1" >>confdefs.h
 
 
   ext_builddir=ext/spl
@@ -110514,50 +87988,34 @@ EOF
   is_it_shared=$PHP_PCRE_SHARED
   is_it_enabled=$PHP_PCRE
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension spl to build statically, but it
 depends on extension pcre, which you've configured to build shared.
 You either need to build spl shared or build pcre statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension spl to build statically, but it
-depends on extension pcre, which you've configured to build shared.
-You either need to build spl shared or build pcre statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension spl, which depends on extension pcre,
-but you've either not enabled pcre, or have disabled it.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension spl, which depends on extension pcre,
 but you've either not enabled pcre, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 
 
-{ echo "$as_me:$LINENO: checking whether flush should be called explicitly after a buffered io" >&5
-echo $ECHO_N "checking whether flush should be called explicitly after a buffered io... $ECHO_C" >&6; }
-if test "${ac_cv_flush_io+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether flush should be called explicitly after a buffered io" >&5
+$as_echo_n "checking whether flush should be called explicitly after a buffered io... " >&6; }
+if test "${ac_cv_flush_io+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
 
   ac_cv_flush_io=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -110595,67 +88053,37 @@ int main(int argc, char **argv)
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_flush_io=no
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
   ac_cv_flush_io=yes
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_flush_io" >&5
-echo "${ECHO_T}$ac_cv_flush_io" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_flush_io" >&5
+$as_echo "$ac_cv_flush_io" >&6; }
 if test "$ac_cv_flush_io" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FLUSHIO 1
-_ACEOF
+$as_echo "#define HAVE_FLUSHIO 1" >>confdefs.h
 
 fi
 
 if test "$ac_cv_func_crypt" = "no"; then
-  { echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
-if test "${ac_cv_lib_crypt_crypt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
+$as_echo_n "checking for crypt in -lcrypt... " >&6; }
+if test "${ac_cv_lib_crypt_crypt+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -110673,67 +88101,40 @@ return crypt ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_crypt_crypt=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_crypt_crypt=no
+  ac_cv_lib_crypt_crypt=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
-if test $ac_cv_lib_crypt_crypt = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
+$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
+if test "x$ac_cv_lib_crypt_crypt" = x""yes; then :
 
     LIBS="-lcrypt $LIBS -lcrypt"
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CRYPT 1
-_ACEOF
+$as_echo "#define HAVE_CRYPT 1" >>confdefs.h
 
 
 fi
 
 fi
 
-{ echo "$as_me:$LINENO: checking for standard DES crypt" >&5
-echo $ECHO_N "checking for standard DES crypt... $ECHO_C" >&6; }
-if test "${ac_cv_crypt_des+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for standard DES crypt" >&5
+$as_echo_n "checking for standard DES crypt... " >&6; }
+if test "${ac_cv_crypt_des+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
   ac_cv_crypt_des=yes
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #if HAVE_UNISTD_H
@@ -110752,63 +88153,35 @@ main() {
 #endif
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_crypt_des=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
   ac_cv_crypt_des=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_crypt_des" >&5
-echo "${ECHO_T}$ac_cv_crypt_des" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_des" >&5
+$as_echo "$ac_cv_crypt_des" >&6; }
 
-{ echo "$as_me:$LINENO: checking for extended DES crypt" >&5
-echo $ECHO_N "checking for extended DES crypt... $ECHO_C" >&6; }
-if test "${ac_cv_crypt_ext_des+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for extended DES crypt" >&5
+$as_echo_n "checking for extended DES crypt... " >&6; }
+if test "${ac_cv_crypt_ext_des+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
   ac_cv_crypt_ext_des=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #if HAVE_UNISTD_H
@@ -110827,63 +88200,35 @@ main() {
 #endif
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_crypt_ext_des=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
   ac_cv_crypt_ext_des=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_crypt_ext_des" >&5
-echo "${ECHO_T}$ac_cv_crypt_ext_des" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_ext_des" >&5
+$as_echo "$ac_cv_crypt_ext_des" >&6; }
 
-{ echo "$as_me:$LINENO: checking for MD5 crypt" >&5
-echo $ECHO_N "checking for MD5 crypt... $ECHO_C" >&6; }
-if test "${ac_cv_crypt_md5+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 crypt" >&5
+$as_echo_n "checking for MD5 crypt... " >&6; }
+if test "${ac_cv_crypt_md5+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
 
   ac_cv_crypt_md5=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #if HAVE_UNISTD_H
@@ -110911,63 +88256,35 @@ main() {
 #endif
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_crypt_md5=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
   ac_cv_crypt_md5=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_crypt_md5" >&5
-echo "${ECHO_T}$ac_cv_crypt_md5" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_md5" >&5
+$as_echo "$ac_cv_crypt_md5" >&6; }
 
-{ echo "$as_me:$LINENO: checking for Blowfish crypt" >&5
-echo $ECHO_N "checking for Blowfish crypt... $ECHO_C" >&6; }
-if test "${ac_cv_crypt_blowfish+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Blowfish crypt" >&5
+$as_echo_n "checking for Blowfish crypt... " >&6; }
+if test "${ac_cv_crypt_blowfish+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
 
   ac_cv_crypt_blowfish=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #if HAVE_UNISTD_H
@@ -110992,63 +88309,35 @@ main() {
 #endif
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_crypt_blowfish=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
   ac_cv_crypt_blowfish=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_crypt_blowfish" >&5
-echo "${ECHO_T}$ac_cv_crypt_blowfish" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_blowfish" >&5
+$as_echo "$ac_cv_crypt_blowfish" >&6; }
 
-{ echo "$as_me:$LINENO: checking for SHA512 crypt" >&5
-echo $ECHO_N "checking for SHA512 crypt... $ECHO_C" >&6; }
-if test "${ac_cv_crypt_SHA512+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA512 crypt" >&5
+$as_echo_n "checking for SHA512 crypt... " >&6; }
+if test "${ac_cv_crypt_SHA512+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
 
   ac_cv_crypt_SHA512=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #if HAVE_UNISTD_H
@@ -111072,63 +88361,35 @@ main() {
 #endif
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_crypt_SHA512=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
   ac_cv_crypt_SHA512=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_crypt_SHA512" >&5
-echo "${ECHO_T}$ac_cv_crypt_SHA512" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_SHA512" >&5
+$as_echo "$ac_cv_crypt_SHA512" >&6; }
 
-{ echo "$as_me:$LINENO: checking for SHA256 crypt" >&5
-echo $ECHO_N "checking for SHA256 crypt... $ECHO_C" >&6; }
-if test "${ac_cv_crypt_SHA256+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA256 crypt" >&5
+$as_echo_n "checking for SHA256 crypt... " >&6; }
+if test "${ac_cv_crypt_SHA256+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
 
   ac_cv_crypt_SHA256=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #if HAVE_UNISTD_H
@@ -111152,61 +88413,33 @@ main() {
 #endif
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_crypt_SHA256=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
   ac_cv_crypt_SHA256=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_crypt_SHA256" >&5
-echo "${ECHO_T}$ac_cv_crypt_SHA256" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_SHA256" >&5
+$as_echo "$ac_cv_crypt_SHA256" >&6; }
 
 
 if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then
 
-        { echo "$as_me:$LINENO: checking whether the compiler supports __alignof__" >&5
-echo $ECHO_N "checking whether the compiler supports __alignof__... $ECHO_C" >&6; }
-if test "${ac_cv_alignof_exists+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports __alignof__" >&5
+$as_echo_n "checking whether the compiler supports __alignof__... " >&6; }
+if test "${ac_cv_alignof_exists+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -111220,58 +88453,32 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
     ac_cv_alignof_exists=yes
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
     ac_cv_alignof_exists=no
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_alignof_exists" >&5
-echo "${ECHO_T}$ac_cv_alignof_exists" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_exists" >&5
+$as_echo "$ac_cv_alignof_exists" >&6; }
   if test "$ac_cv_alignof_exists" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALIGNOF 1
-_ACEOF
+$as_echo "#define HAVE_ALIGNOF 1" >>confdefs.h
 
   fi
 
-        { echo "$as_me:$LINENO: checking whether the compiler supports aligned attribute" >&5
-echo $ECHO_N "checking whether the compiler supports aligned attribute... $ECHO_C" >&6; }
-if test "${ac_cv_attribute_aligned+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports aligned attribute" >&5
+$as_echo_n "checking whether the compiler supports aligned attribute... " >&6; }
+if test "${ac_cv_attribute_aligned+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -111285,44 +88492,22 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
     ac_cv_attribute_aligned=yes
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
     ac_cv_attribute_aligned=no
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_attribute_aligned" >&5
-echo "${ECHO_T}$ac_cv_attribute_aligned" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_attribute_aligned" >&5
+$as_echo "$ac_cv_attribute_aligned" >&6; }
   if test "$ac_cv_attribute_aligned" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ATTRIBUTE_ALIGNED 1
-_ACEOF
+$as_echo "#define HAVE_ATTRIBUTE_ALIGNED 1" >>confdefs.h
 
   fi
 
@@ -111492,131 +88677,32 @@ _ACEOF
 
 fi
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 for ac_func in getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+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"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
-{ echo "$as_me:$LINENO: checking for working POSIX fnmatch" >&5
-echo $ECHO_N "checking for working POSIX fnmatch... $ECHO_C" >&6; }
-if test "${ac_cv_func_fnmatch_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working POSIX fnmatch" >&5
+$as_echo_n "checking for working POSIX fnmatch... " >&6; }
+if test "${ac_cv_func_fnmatch_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   # Some versions of Solaris, SCO, and the GNU C Library
    # have a broken or incompatible fnmatch.
    # So we run a test program.  If we are cross-compiling, take no chance.
    # Thanks to John Oleynick, Franc,ois Pinard, and Paul Eggert for this test.
-   if test "$cross_compiling" = yes; then
+   if test "$cross_compiling" = yes; then :
   ac_cv_func_fnmatch_works=cross
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <fnmatch.h>
 #	   define y(a, b, c) (fnmatch (a, b, c) == 0)
@@ -111637,143 +88723,34 @@ return
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_fnmatch_works=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_fnmatch_works=no
+  ac_cv_func_fnmatch_works=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_fnmatch_works" >&5
-echo "${ECHO_T}$ac_cv_func_fnmatch_works" >&6; }
-if test $ac_cv_func_fnmatch_works = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fnmatch_works" >&5
+$as_echo "$ac_cv_func_fnmatch_works" >&6; }
+if test $ac_cv_func_fnmatch_works = yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FNMATCH 1
-_ACEOF
+$as_echo "#define HAVE_FNMATCH 1" >>confdefs.h
 
 fi
 
 
 
-
-
-
 for ac_func in fork CreateProcess
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+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"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
   php_can_support_proc_open=yes
@@ -111786,26 +88763,44 @@ else
 fi
 done
 
-{ echo "$as_me:$LINENO: checking if your OS can spawn processes with inherited handles" >&5
-echo $ECHO_N "checking if your OS can spawn processes with inherited handles... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if your OS can spawn processes with inherited handles" >&5
+$as_echo_n "checking if your OS can spawn processes with inherited handles... " >&6; }
 if test "$php_can_support_proc_open" = "yes"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define PHP_CAN_SUPPORT_PROC_OPEN 1
-_ACEOF
+$as_echo "#define PHP_CAN_SUPPORT_PROC_OPEN 1" >>confdefs.h
 
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-if test "$PHP_SAPI" = "cgi" || test "$PHP_SAPI" = "cli" || test "$PHP_SAPI" = "embed"; then
+PHP_ENABLE_CHROOT_FUNC=no
+case "$PHP_SAPI" in
+  embed)
+    PHP_ENABLE_CHROOT_FUNC=yes
+  ;;
 
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_CHROOT_FUNC 1
-_ACEOF
+  none)
+    for PROG in $PHP_BINARIES; do
+      case "$PROG" in
+        cgi|cli)
+          PHP_ENABLE_CHROOT_FUNC=yes
+        ;;
+
+        *)
+          PHP_ENABLE_CHROOT_FUNC=no
+          break
+        ;;
+      esac
+   done
+  ;;
+esac
+
+if test "$PHP_ENABLE_CHROOT_FUNC" = "yes"; then
+
+$as_echo "#define ENABLE_CHROOT_FUNC 1" >>confdefs.h
 
 fi
 
@@ -111814,172 +88809,12 @@ fi
   unset ac_cv_func___res_nsearch
   unset found
 
-  { echo "$as_me:$LINENO: checking for res_nsearch" >&5
-echo $ECHO_N "checking for res_nsearch... $ECHO_C" >&6; }
-if test "${ac_cv_func_res_nsearch+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define res_nsearch to an innocuous variant, in case <limits.h> declares res_nsearch.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define res_nsearch innocuous_res_nsearch
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char res_nsearch (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef res_nsearch
-
-/* 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 res_nsearch ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_res_nsearch || defined __stub___res_nsearch
-choke me
-#endif
-
-int
-main ()
-{
-return res_nsearch ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_res_nsearch=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_res_nsearch=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_res_nsearch" >&5
-echo "${ECHO_T}$ac_cv_func_res_nsearch" >&6; }
-if test $ac_cv_func_res_nsearch = yes; then
+  ac_fn_c_check_func "$LINENO" "res_nsearch" "ac_cv_func_res_nsearch"
+if test "x$ac_cv_func_res_nsearch" = x""yes; then :
   found=yes
 else
-   { echo "$as_me:$LINENO: checking for __res_nsearch" >&5
-echo $ECHO_N "checking for __res_nsearch... $ECHO_C" >&6; }
-if test "${ac_cv_func___res_nsearch+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __res_nsearch to an innocuous variant, in case <limits.h> declares __res_nsearch.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __res_nsearch innocuous___res_nsearch
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __res_nsearch (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __res_nsearch
-
-/* 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 __res_nsearch ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub___res_nsearch || defined __stub_____res_nsearch
-choke me
-#endif
-
-int
-main ()
-{
-return __res_nsearch ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func___res_nsearch=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func___res_nsearch=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func___res_nsearch" >&5
-echo "${ECHO_T}$ac_cv_func___res_nsearch" >&6; }
-if test $ac_cv_func___res_nsearch = yes; then
+   ac_fn_c_check_func "$LINENO" "__res_nsearch" "ac_cv_func___res_nsearch"
+if test "x$ac_cv_func___res_nsearch" = x""yes; then :
   found=yes
 else
   found=no
@@ -111991,9 +88826,7 @@ fi
   case $found in
   yes)
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_RES_NSEARCH 1
-_ACEOF
+$as_echo "#define HAVE_RES_NSEARCH 1" >>confdefs.h
 
     ac_cv_func_res_nsearch=yes
   ;;
@@ -112003,18 +88836,14 @@ _ACEOF
   unset ac_cv_lib_resolv_res_nsearch
   unset ac_cv_lib_resolv___res_nsearch
   unset found
-  { echo "$as_me:$LINENO: checking for res_nsearch in -lresolv" >&5
-echo $ECHO_N "checking for res_nsearch in -lresolv... $ECHO_C" >&6; }
-if test "${ac_cv_lib_resolv_res_nsearch+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lresolv" >&5
+$as_echo_n "checking for res_nsearch in -lresolv... " >&6; }
+if test "${ac_cv_lib_resolv_res_nsearch+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -112032,54 +88861,29 @@ return res_nsearch ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_res_nsearch=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_resolv_res_nsearch=no
+  ac_cv_lib_resolv_res_nsearch=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_nsearch" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv_res_nsearch" >&6; }
-if test $ac_cv_lib_resolv_res_nsearch = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_nsearch" >&5
+$as_echo "$ac_cv_lib_resolv_res_nsearch" >&6; }
+if test "x$ac_cv_lib_resolv_res_nsearch" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __res_nsearch in -lresolv" >&5
-echo $ECHO_N "checking for __res_nsearch in -lresolv... $ECHO_C" >&6; }
-if test "${ac_cv_lib_resolv___res_nsearch+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lresolv" >&5
+$as_echo_n "checking for __res_nsearch in -lresolv... " >&6; }
+if test "${ac_cv_lib_resolv___res_nsearch+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -112097,39 +88901,18 @@ return __res_nsearch ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv___res_nsearch=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_resolv___res_nsearch=no
+  ac_cv_lib_resolv___res_nsearch=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___res_nsearch" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv___res_nsearch" >&6; }
-if test $ac_cv_lib_resolv___res_nsearch = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_nsearch" >&5
+$as_echo "$ac_cv_lib_resolv___res_nsearch" >&6; }
+if test "x$ac_cv_lib_resolv___res_nsearch" = x""yes; then :
   found=yes
 else
   found=no
@@ -112142,50 +88925,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lresolv"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -112201,14 +88956,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_RES_NSEARCH 1
-_ACEOF
+$as_echo "#define HAVE_RES_NSEARCH 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBRESOLV 1
-_ACEOF
+$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_res_nsearch=yes
   else
@@ -112217,18 +88968,14 @@ _ACEOF
   unset ac_cv_lib_bind_res_nsearch
   unset ac_cv_lib_bind___res_nsearch
   unset found
-  { echo "$as_me:$LINENO: checking for res_nsearch in -lbind" >&5
-echo $ECHO_N "checking for res_nsearch in -lbind... $ECHO_C" >&6; }
-if test "${ac_cv_lib_bind_res_nsearch+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lbind" >&5
+$as_echo_n "checking for res_nsearch in -lbind... " >&6; }
+if test "${ac_cv_lib_bind_res_nsearch+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -112246,54 +88993,29 @@ return res_nsearch ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_res_nsearch=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_bind_res_nsearch=no
+  ac_cv_lib_bind_res_nsearch=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bind_res_nsearch" >&5
-echo "${ECHO_T}$ac_cv_lib_bind_res_nsearch" >&6; }
-if test $ac_cv_lib_bind_res_nsearch = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_nsearch" >&5
+$as_echo "$ac_cv_lib_bind_res_nsearch" >&6; }
+if test "x$ac_cv_lib_bind_res_nsearch" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __res_nsearch in -lbind" >&5
-echo $ECHO_N "checking for __res_nsearch in -lbind... $ECHO_C" >&6; }
-if test "${ac_cv_lib_bind___res_nsearch+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lbind" >&5
+$as_echo_n "checking for __res_nsearch in -lbind... " >&6; }
+if test "${ac_cv_lib_bind___res_nsearch+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -112311,39 +89033,18 @@ return __res_nsearch ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind___res_nsearch=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_bind___res_nsearch=no
+  ac_cv_lib_bind___res_nsearch=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bind___res_nsearch" >&5
-echo "${ECHO_T}$ac_cv_lib_bind___res_nsearch" >&6; }
-if test $ac_cv_lib_bind___res_nsearch = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_nsearch" >&5
+$as_echo "$ac_cv_lib_bind___res_nsearch" >&6; }
+if test "x$ac_cv_lib_bind___res_nsearch" = x""yes; then :
   found=yes
 else
   found=no
@@ -112356,50 +89057,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbind"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -112415,14 +89088,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_RES_NSEARCH 1
-_ACEOF
+$as_echo "#define HAVE_RES_NSEARCH 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBBIND 1
-_ACEOF
+$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_res_nsearch=yes
   else
@@ -112431,18 +89100,14 @@ _ACEOF
   unset ac_cv_lib_socket_res_nsearch
   unset ac_cv_lib_socket___res_nsearch
   unset found
-  { echo "$as_me:$LINENO: checking for res_nsearch in -lsocket" >&5
-echo $ECHO_N "checking for res_nsearch in -lsocket... $ECHO_C" >&6; }
-if test "${ac_cv_lib_socket_res_nsearch+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lsocket" >&5
+$as_echo_n "checking for res_nsearch in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_res_nsearch+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -112460,54 +89125,29 @@ return res_nsearch ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_res_nsearch=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket_res_nsearch=no
+  ac_cv_lib_socket_res_nsearch=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_res_nsearch" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_res_nsearch" >&6; }
-if test $ac_cv_lib_socket_res_nsearch = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_nsearch" >&5
+$as_echo "$ac_cv_lib_socket_res_nsearch" >&6; }
+if test "x$ac_cv_lib_socket_res_nsearch" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __res_nsearch in -lsocket" >&5
-echo $ECHO_N "checking for __res_nsearch in -lsocket... $ECHO_C" >&6; }
-if test "${ac_cv_lib_socket___res_nsearch+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lsocket" >&5
+$as_echo_n "checking for __res_nsearch in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket___res_nsearch+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -112525,39 +89165,18 @@ return __res_nsearch ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___res_nsearch=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket___res_nsearch=no
+  ac_cv_lib_socket___res_nsearch=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket___res_nsearch" >&5
-echo "${ECHO_T}$ac_cv_lib_socket___res_nsearch" >&6; }
-if test $ac_cv_lib_socket___res_nsearch = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_nsearch" >&5
+$as_echo "$ac_cv_lib_socket___res_nsearch" >&6; }
+if test "x$ac_cv_lib_socket___res_nsearch" = x""yes; then :
   found=yes
 else
   found=no
@@ -112570,50 +89189,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -112629,14 +89220,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_RES_NSEARCH 1
-_ACEOF
+$as_echo "#define HAVE_RES_NSEARCH 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBSOCKET 1
-_ACEOF
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_res_nsearch=yes
   else
@@ -112660,172 +89247,12 @@ _ACEOF
   unset ac_cv_func___dns_search
   unset found
 
-  { echo "$as_me:$LINENO: checking for dns_search" >&5
-echo $ECHO_N "checking for dns_search... $ECHO_C" >&6; }
-if test "${ac_cv_func_dns_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dns_search to an innocuous variant, in case <limits.h> declares dns_search.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dns_search innocuous_dns_search
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dns_search (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dns_search
-
-/* 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 dns_search ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_dns_search || defined __stub___dns_search
-choke me
-#endif
-
-int
-main ()
-{
-return dns_search ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_dns_search=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_dns_search=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dns_search" >&5
-echo "${ECHO_T}$ac_cv_func_dns_search" >&6; }
-if test $ac_cv_func_dns_search = yes; then
+  ac_fn_c_check_func "$LINENO" "dns_search" "ac_cv_func_dns_search"
+if test "x$ac_cv_func_dns_search" = x""yes; then :
   found=yes
 else
-   { echo "$as_me:$LINENO: checking for __dns_search" >&5
-echo $ECHO_N "checking for __dns_search... $ECHO_C" >&6; }
-if test "${ac_cv_func___dns_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __dns_search to an innocuous variant, in case <limits.h> declares __dns_search.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __dns_search innocuous___dns_search
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __dns_search (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __dns_search
-
-/* 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 __dns_search ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub___dns_search || defined __stub_____dns_search
-choke me
-#endif
-
-int
-main ()
-{
-return __dns_search ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func___dns_search=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func___dns_search=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func___dns_search" >&5
-echo "${ECHO_T}$ac_cv_func___dns_search" >&6; }
-if test $ac_cv_func___dns_search = yes; then
+   ac_fn_c_check_func "$LINENO" "__dns_search" "ac_cv_func___dns_search"
+if test "x$ac_cv_func___dns_search" = x""yes; then :
   found=yes
 else
   found=no
@@ -112837,9 +89264,7 @@ fi
   case $found in
   yes)
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DNS_SEARCH 1
-_ACEOF
+$as_echo "#define HAVE_DNS_SEARCH 1" >>confdefs.h
 
     ac_cv_func_dns_search=yes
   ;;
@@ -112849,18 +89274,14 @@ _ACEOF
   unset ac_cv_lib_resolv_dns_search
   unset ac_cv_lib_resolv___dns_search
   unset found
-  { echo "$as_me:$LINENO: checking for dns_search in -lresolv" >&5
-echo $ECHO_N "checking for dns_search in -lresolv... $ECHO_C" >&6; }
-if test "${ac_cv_lib_resolv_dns_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lresolv" >&5
+$as_echo_n "checking for dns_search in -lresolv... " >&6; }
+if test "${ac_cv_lib_resolv_dns_search+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -112878,54 +89299,29 @@ return dns_search ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_dns_search=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_resolv_dns_search=no
+  ac_cv_lib_resolv_dns_search=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dns_search" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv_dns_search" >&6; }
-if test $ac_cv_lib_resolv_dns_search = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dns_search" >&5
+$as_echo "$ac_cv_lib_resolv_dns_search" >&6; }
+if test "x$ac_cv_lib_resolv_dns_search" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __dns_search in -lresolv" >&5
-echo $ECHO_N "checking for __dns_search in -lresolv... $ECHO_C" >&6; }
-if test "${ac_cv_lib_resolv___dns_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lresolv" >&5
+$as_echo_n "checking for __dns_search in -lresolv... " >&6; }
+if test "${ac_cv_lib_resolv___dns_search+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -112943,39 +89339,18 @@ return __dns_search ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv___dns_search=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_resolv___dns_search=no
+  ac_cv_lib_resolv___dns_search=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dns_search" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv___dns_search" >&6; }
-if test $ac_cv_lib_resolv___dns_search = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dns_search" >&5
+$as_echo "$ac_cv_lib_resolv___dns_search" >&6; }
+if test "x$ac_cv_lib_resolv___dns_search" = x""yes; then :
   found=yes
 else
   found=no
@@ -112988,50 +89363,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lresolv"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -113047,14 +89394,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DNS_SEARCH 1
-_ACEOF
+$as_echo "#define HAVE_DNS_SEARCH 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBRESOLV 1
-_ACEOF
+$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_dns_search=yes
   else
@@ -113063,18 +89406,14 @@ _ACEOF
   unset ac_cv_lib_bind_dns_search
   unset ac_cv_lib_bind___dns_search
   unset found
-  { echo "$as_me:$LINENO: checking for dns_search in -lbind" >&5
-echo $ECHO_N "checking for dns_search in -lbind... $ECHO_C" >&6; }
-if test "${ac_cv_lib_bind_dns_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lbind" >&5
+$as_echo_n "checking for dns_search in -lbind... " >&6; }
+if test "${ac_cv_lib_bind_dns_search+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -113092,54 +89431,29 @@ return dns_search ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_dns_search=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_bind_dns_search=no
+  ac_cv_lib_bind_dns_search=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bind_dns_search" >&5
-echo "${ECHO_T}$ac_cv_lib_bind_dns_search" >&6; }
-if test $ac_cv_lib_bind_dns_search = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dns_search" >&5
+$as_echo "$ac_cv_lib_bind_dns_search" >&6; }
+if test "x$ac_cv_lib_bind_dns_search" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __dns_search in -lbind" >&5
-echo $ECHO_N "checking for __dns_search in -lbind... $ECHO_C" >&6; }
-if test "${ac_cv_lib_bind___dns_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lbind" >&5
+$as_echo_n "checking for __dns_search in -lbind... " >&6; }
+if test "${ac_cv_lib_bind___dns_search+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -113157,39 +89471,18 @@ return __dns_search ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind___dns_search=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_bind___dns_search=no
+  ac_cv_lib_bind___dns_search=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bind___dns_search" >&5
-echo "${ECHO_T}$ac_cv_lib_bind___dns_search" >&6; }
-if test $ac_cv_lib_bind___dns_search = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dns_search" >&5
+$as_echo "$ac_cv_lib_bind___dns_search" >&6; }
+if test "x$ac_cv_lib_bind___dns_search" = x""yes; then :
   found=yes
 else
   found=no
@@ -113202,50 +89495,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbind"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -113261,14 +89526,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DNS_SEARCH 1
-_ACEOF
+$as_echo "#define HAVE_DNS_SEARCH 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBBIND 1
-_ACEOF
+$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_dns_search=yes
   else
@@ -113277,18 +89538,14 @@ _ACEOF
   unset ac_cv_lib_socket_dns_search
   unset ac_cv_lib_socket___dns_search
   unset found
-  { echo "$as_me:$LINENO: checking for dns_search in -lsocket" >&5
-echo $ECHO_N "checking for dns_search in -lsocket... $ECHO_C" >&6; }
-if test "${ac_cv_lib_socket_dns_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lsocket" >&5
+$as_echo_n "checking for dns_search in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_dns_search+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -113306,54 +89563,29 @@ return dns_search ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_dns_search=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket_dns_search=no
+  ac_cv_lib_socket_dns_search=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_dns_search" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_dns_search" >&6; }
-if test $ac_cv_lib_socket_dns_search = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dns_search" >&5
+$as_echo "$ac_cv_lib_socket_dns_search" >&6; }
+if test "x$ac_cv_lib_socket_dns_search" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __dns_search in -lsocket" >&5
-echo $ECHO_N "checking for __dns_search in -lsocket... $ECHO_C" >&6; }
-if test "${ac_cv_lib_socket___dns_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lsocket" >&5
+$as_echo_n "checking for __dns_search in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket___dns_search+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -113371,39 +89603,18 @@ return __dns_search ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___dns_search=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket___dns_search=no
+  ac_cv_lib_socket___dns_search=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket___dns_search" >&5
-echo "${ECHO_T}$ac_cv_lib_socket___dns_search" >&6; }
-if test $ac_cv_lib_socket___dns_search = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dns_search" >&5
+$as_echo "$ac_cv_lib_socket___dns_search" >&6; }
+if test "x$ac_cv_lib_socket___dns_search" = x""yes; then :
   found=yes
 else
   found=no
@@ -113416,50 +89627,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -113475,14 +89658,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DNS_SEARCH 1
-_ACEOF
+$as_echo "#define HAVE_DNS_SEARCH 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBSOCKET 1
-_ACEOF
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_dns_search=yes
   else
@@ -113506,172 +89685,12 @@ _ACEOF
   unset ac_cv_func___dn_expand
   unset found
 
-  { echo "$as_me:$LINENO: checking for dn_expand" >&5
-echo $ECHO_N "checking for dn_expand... $ECHO_C" >&6; }
-if test "${ac_cv_func_dn_expand+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dn_expand to an innocuous variant, in case <limits.h> declares dn_expand.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dn_expand innocuous_dn_expand
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dn_expand (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dn_expand
-
-/* 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 dn_expand ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_dn_expand || defined __stub___dn_expand
-choke me
-#endif
-
-int
-main ()
-{
-return dn_expand ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_dn_expand=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_dn_expand=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dn_expand" >&5
-echo "${ECHO_T}$ac_cv_func_dn_expand" >&6; }
-if test $ac_cv_func_dn_expand = yes; then
+  ac_fn_c_check_func "$LINENO" "dn_expand" "ac_cv_func_dn_expand"
+if test "x$ac_cv_func_dn_expand" = x""yes; then :
   found=yes
 else
-   { echo "$as_me:$LINENO: checking for __dn_expand" >&5
-echo $ECHO_N "checking for __dn_expand... $ECHO_C" >&6; }
-if test "${ac_cv_func___dn_expand+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __dn_expand to an innocuous variant, in case <limits.h> declares __dn_expand.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __dn_expand innocuous___dn_expand
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __dn_expand (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __dn_expand
-
-/* 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 __dn_expand ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub___dn_expand || defined __stub_____dn_expand
-choke me
-#endif
-
-int
-main ()
-{
-return __dn_expand ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func___dn_expand=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func___dn_expand=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func___dn_expand" >&5
-echo "${ECHO_T}$ac_cv_func___dn_expand" >&6; }
-if test $ac_cv_func___dn_expand = yes; then
+   ac_fn_c_check_func "$LINENO" "__dn_expand" "ac_cv_func___dn_expand"
+if test "x$ac_cv_func___dn_expand" = x""yes; then :
   found=yes
 else
   found=no
@@ -113683,9 +89702,7 @@ fi
   case $found in
   yes)
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DN_EXPAND 1
-_ACEOF
+$as_echo "#define HAVE_DN_EXPAND 1" >>confdefs.h
 
     ac_cv_func_dn_expand=yes
   ;;
@@ -113695,18 +89712,14 @@ _ACEOF
   unset ac_cv_lib_resolv_dn_expand
   unset ac_cv_lib_resolv___dn_expand
   unset found
-  { echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5
-echo $ECHO_N "checking for dn_expand in -lresolv... $ECHO_C" >&6; }
-if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lresolv" >&5
+$as_echo_n "checking for dn_expand in -lresolv... " >&6; }
+if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -113724,54 +89737,29 @@ return dn_expand ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_dn_expand=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_resolv_dn_expand=no
+  ac_cv_lib_resolv_dn_expand=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dn_expand" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv_dn_expand" >&6; }
-if test $ac_cv_lib_resolv_dn_expand = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dn_expand" >&5
+$as_echo "$ac_cv_lib_resolv_dn_expand" >&6; }
+if test "x$ac_cv_lib_resolv_dn_expand" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __dn_expand in -lresolv" >&5
-echo $ECHO_N "checking for __dn_expand in -lresolv... $ECHO_C" >&6; }
-if test "${ac_cv_lib_resolv___dn_expand+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lresolv" >&5
+$as_echo_n "checking for __dn_expand in -lresolv... " >&6; }
+if test "${ac_cv_lib_resolv___dn_expand+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -113789,39 +89777,18 @@ return __dn_expand ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv___dn_expand=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_resolv___dn_expand=no
+  ac_cv_lib_resolv___dn_expand=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dn_expand" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv___dn_expand" >&6; }
-if test $ac_cv_lib_resolv___dn_expand = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_expand" >&5
+$as_echo "$ac_cv_lib_resolv___dn_expand" >&6; }
+if test "x$ac_cv_lib_resolv___dn_expand" = x""yes; then :
   found=yes
 else
   found=no
@@ -113834,50 +89801,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lresolv"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -113893,14 +89832,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DN_EXPAND 1
-_ACEOF
+$as_echo "#define HAVE_DN_EXPAND 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBRESOLV 1
-_ACEOF
+$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_dn_expand=yes
   else
@@ -113909,18 +89844,14 @@ _ACEOF
   unset ac_cv_lib_bind_dn_expand
   unset ac_cv_lib_bind___dn_expand
   unset found
-  { echo "$as_me:$LINENO: checking for dn_expand in -lbind" >&5
-echo $ECHO_N "checking for dn_expand in -lbind... $ECHO_C" >&6; }
-if test "${ac_cv_lib_bind_dn_expand+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lbind" >&5
+$as_echo_n "checking for dn_expand in -lbind... " >&6; }
+if test "${ac_cv_lib_bind_dn_expand+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -113938,54 +89869,29 @@ return dn_expand ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_dn_expand=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_bind_dn_expand=no
+  ac_cv_lib_bind_dn_expand=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bind_dn_expand" >&5
-echo "${ECHO_T}$ac_cv_lib_bind_dn_expand" >&6; }
-if test $ac_cv_lib_bind_dn_expand = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dn_expand" >&5
+$as_echo "$ac_cv_lib_bind_dn_expand" >&6; }
+if test "x$ac_cv_lib_bind_dn_expand" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __dn_expand in -lbind" >&5
-echo $ECHO_N "checking for __dn_expand in -lbind... $ECHO_C" >&6; }
-if test "${ac_cv_lib_bind___dn_expand+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lbind" >&5
+$as_echo_n "checking for __dn_expand in -lbind... " >&6; }
+if test "${ac_cv_lib_bind___dn_expand+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -114003,39 +89909,18 @@ return __dn_expand ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind___dn_expand=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_bind___dn_expand=no
+  ac_cv_lib_bind___dn_expand=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bind___dn_expand" >&5
-echo "${ECHO_T}$ac_cv_lib_bind___dn_expand" >&6; }
-if test $ac_cv_lib_bind___dn_expand = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dn_expand" >&5
+$as_echo "$ac_cv_lib_bind___dn_expand" >&6; }
+if test "x$ac_cv_lib_bind___dn_expand" = x""yes; then :
   found=yes
 else
   found=no
@@ -114048,50 +89933,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbind"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -114107,14 +89964,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DN_EXPAND 1
-_ACEOF
+$as_echo "#define HAVE_DN_EXPAND 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBBIND 1
-_ACEOF
+$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_dn_expand=yes
   else
@@ -114123,18 +89976,14 @@ _ACEOF
   unset ac_cv_lib_socket_dn_expand
   unset ac_cv_lib_socket___dn_expand
   unset found
-  { echo "$as_me:$LINENO: checking for dn_expand in -lsocket" >&5
-echo $ECHO_N "checking for dn_expand in -lsocket... $ECHO_C" >&6; }
-if test "${ac_cv_lib_socket_dn_expand+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lsocket" >&5
+$as_echo_n "checking for dn_expand in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_dn_expand+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -114152,54 +90001,29 @@ return dn_expand ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_dn_expand=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket_dn_expand=no
+  ac_cv_lib_socket_dn_expand=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_dn_expand" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_dn_expand" >&6; }
-if test $ac_cv_lib_socket_dn_expand = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dn_expand" >&5
+$as_echo "$ac_cv_lib_socket_dn_expand" >&6; }
+if test "x$ac_cv_lib_socket_dn_expand" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __dn_expand in -lsocket" >&5
-echo $ECHO_N "checking for __dn_expand in -lsocket... $ECHO_C" >&6; }
-if test "${ac_cv_lib_socket___dn_expand+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lsocket" >&5
+$as_echo_n "checking for __dn_expand in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket___dn_expand+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -114217,39 +90041,18 @@ return __dn_expand ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___dn_expand=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket___dn_expand=no
+  ac_cv_lib_socket___dn_expand=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket___dn_expand" >&5
-echo "${ECHO_T}$ac_cv_lib_socket___dn_expand" >&6; }
-if test $ac_cv_lib_socket___dn_expand = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dn_expand" >&5
+$as_echo "$ac_cv_lib_socket___dn_expand" >&6; }
+if test "x$ac_cv_lib_socket___dn_expand" = x""yes; then :
   found=yes
 else
   found=no
@@ -114262,50 +90065,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -114321,14 +90096,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DN_EXPAND 1
-_ACEOF
+$as_echo "#define HAVE_DN_EXPAND 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBSOCKET 1
-_ACEOF
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_dn_expand=yes
   else
@@ -114352,172 +90123,12 @@ _ACEOF
   unset ac_cv_func___dn_skipname
   unset found
 
-  { echo "$as_me:$LINENO: checking for dn_skipname" >&5
-echo $ECHO_N "checking for dn_skipname... $ECHO_C" >&6; }
-if test "${ac_cv_func_dn_skipname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dn_skipname to an innocuous variant, in case <limits.h> declares dn_skipname.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dn_skipname innocuous_dn_skipname
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dn_skipname (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dn_skipname
-
-/* 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 dn_skipname ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_dn_skipname || defined __stub___dn_skipname
-choke me
-#endif
-
-int
-main ()
-{
-return dn_skipname ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_dn_skipname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_dn_skipname=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dn_skipname" >&5
-echo "${ECHO_T}$ac_cv_func_dn_skipname" >&6; }
-if test $ac_cv_func_dn_skipname = yes; then
+  ac_fn_c_check_func "$LINENO" "dn_skipname" "ac_cv_func_dn_skipname"
+if test "x$ac_cv_func_dn_skipname" = x""yes; then :
   found=yes
 else
-   { echo "$as_me:$LINENO: checking for __dn_skipname" >&5
-echo $ECHO_N "checking for __dn_skipname... $ECHO_C" >&6; }
-if test "${ac_cv_func___dn_skipname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __dn_skipname to an innocuous variant, in case <limits.h> declares __dn_skipname.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __dn_skipname innocuous___dn_skipname
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __dn_skipname (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __dn_skipname
-
-/* 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 __dn_skipname ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub___dn_skipname || defined __stub_____dn_skipname
-choke me
-#endif
-
-int
-main ()
-{
-return __dn_skipname ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func___dn_skipname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func___dn_skipname=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func___dn_skipname" >&5
-echo "${ECHO_T}$ac_cv_func___dn_skipname" >&6; }
-if test $ac_cv_func___dn_skipname = yes; then
+   ac_fn_c_check_func "$LINENO" "__dn_skipname" "ac_cv_func___dn_skipname"
+if test "x$ac_cv_func___dn_skipname" = x""yes; then :
   found=yes
 else
   found=no
@@ -114529,9 +90140,7 @@ fi
   case $found in
   yes)
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DN_SKIPNAME 1
-_ACEOF
+$as_echo "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
 
     ac_cv_func_dn_skipname=yes
   ;;
@@ -114541,18 +90150,14 @@ _ACEOF
   unset ac_cv_lib_resolv_dn_skipname
   unset ac_cv_lib_resolv___dn_skipname
   unset found
-  { echo "$as_me:$LINENO: checking for dn_skipname in -lresolv" >&5
-echo $ECHO_N "checking for dn_skipname in -lresolv... $ECHO_C" >&6; }
-if test "${ac_cv_lib_resolv_dn_skipname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lresolv" >&5
+$as_echo_n "checking for dn_skipname in -lresolv... " >&6; }
+if test "${ac_cv_lib_resolv_dn_skipname+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -114570,54 +90175,29 @@ return dn_skipname ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_dn_skipname=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_resolv_dn_skipname=no
+  ac_cv_lib_resolv_dn_skipname=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dn_skipname" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv_dn_skipname" >&6; }
-if test $ac_cv_lib_resolv_dn_skipname = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dn_skipname" >&5
+$as_echo "$ac_cv_lib_resolv_dn_skipname" >&6; }
+if test "x$ac_cv_lib_resolv_dn_skipname" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __dn_skipname in -lresolv" >&5
-echo $ECHO_N "checking for __dn_skipname in -lresolv... $ECHO_C" >&6; }
-if test "${ac_cv_lib_resolv___dn_skipname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lresolv" >&5
+$as_echo_n "checking for __dn_skipname in -lresolv... " >&6; }
+if test "${ac_cv_lib_resolv___dn_skipname+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -114635,39 +90215,18 @@ return __dn_skipname ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv___dn_skipname=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_resolv___dn_skipname=no
+  ac_cv_lib_resolv___dn_skipname=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dn_skipname" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv___dn_skipname" >&6; }
-if test $ac_cv_lib_resolv___dn_skipname = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_skipname" >&5
+$as_echo "$ac_cv_lib_resolv___dn_skipname" >&6; }
+if test "x$ac_cv_lib_resolv___dn_skipname" = x""yes; then :
   found=yes
 else
   found=no
@@ -114680,50 +90239,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lresolv"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -114739,14 +90270,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DN_SKIPNAME 1
-_ACEOF
+$as_echo "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBRESOLV 1
-_ACEOF
+$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_dn_skipname=yes
   else
@@ -114755,18 +90282,14 @@ _ACEOF
   unset ac_cv_lib_bind_dn_skipname
   unset ac_cv_lib_bind___dn_skipname
   unset found
-  { echo "$as_me:$LINENO: checking for dn_skipname in -lbind" >&5
-echo $ECHO_N "checking for dn_skipname in -lbind... $ECHO_C" >&6; }
-if test "${ac_cv_lib_bind_dn_skipname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lbind" >&5
+$as_echo_n "checking for dn_skipname in -lbind... " >&6; }
+if test "${ac_cv_lib_bind_dn_skipname+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -114784,54 +90307,29 @@ return dn_skipname ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_dn_skipname=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_bind_dn_skipname=no
+  ac_cv_lib_bind_dn_skipname=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bind_dn_skipname" >&5
-echo "${ECHO_T}$ac_cv_lib_bind_dn_skipname" >&6; }
-if test $ac_cv_lib_bind_dn_skipname = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dn_skipname" >&5
+$as_echo "$ac_cv_lib_bind_dn_skipname" >&6; }
+if test "x$ac_cv_lib_bind_dn_skipname" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __dn_skipname in -lbind" >&5
-echo $ECHO_N "checking for __dn_skipname in -lbind... $ECHO_C" >&6; }
-if test "${ac_cv_lib_bind___dn_skipname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lbind" >&5
+$as_echo_n "checking for __dn_skipname in -lbind... " >&6; }
+if test "${ac_cv_lib_bind___dn_skipname+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -114849,39 +90347,18 @@ return __dn_skipname ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind___dn_skipname=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_bind___dn_skipname=no
+  ac_cv_lib_bind___dn_skipname=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bind___dn_skipname" >&5
-echo "${ECHO_T}$ac_cv_lib_bind___dn_skipname" >&6; }
-if test $ac_cv_lib_bind___dn_skipname = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dn_skipname" >&5
+$as_echo "$ac_cv_lib_bind___dn_skipname" >&6; }
+if test "x$ac_cv_lib_bind___dn_skipname" = x""yes; then :
   found=yes
 else
   found=no
@@ -114894,50 +90371,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbind"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -114953,14 +90402,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DN_SKIPNAME 1
-_ACEOF
+$as_echo "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBBIND 1
-_ACEOF
+$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_dn_skipname=yes
   else
@@ -114969,18 +90414,14 @@ _ACEOF
   unset ac_cv_lib_socket_dn_skipname
   unset ac_cv_lib_socket___dn_skipname
   unset found
-  { echo "$as_me:$LINENO: checking for dn_skipname in -lsocket" >&5
-echo $ECHO_N "checking for dn_skipname in -lsocket... $ECHO_C" >&6; }
-if test "${ac_cv_lib_socket_dn_skipname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lsocket" >&5
+$as_echo_n "checking for dn_skipname in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_dn_skipname+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -114998,54 +90439,29 @@ return dn_skipname ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_dn_skipname=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket_dn_skipname=no
+  ac_cv_lib_socket_dn_skipname=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_dn_skipname" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_dn_skipname" >&6; }
-if test $ac_cv_lib_socket_dn_skipname = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dn_skipname" >&5
+$as_echo "$ac_cv_lib_socket_dn_skipname" >&6; }
+if test "x$ac_cv_lib_socket_dn_skipname" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __dn_skipname in -lsocket" >&5
-echo $ECHO_N "checking for __dn_skipname in -lsocket... $ECHO_C" >&6; }
-if test "${ac_cv_lib_socket___dn_skipname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lsocket" >&5
+$as_echo_n "checking for __dn_skipname in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket___dn_skipname+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -115063,39 +90479,18 @@ return __dn_skipname ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___dn_skipname=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket___dn_skipname=no
+  ac_cv_lib_socket___dn_skipname=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket___dn_skipname" >&5
-echo "${ECHO_T}$ac_cv_lib_socket___dn_skipname" >&6; }
-if test $ac_cv_lib_socket___dn_skipname = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dn_skipname" >&5
+$as_echo "$ac_cv_lib_socket___dn_skipname" >&6; }
+if test "x$ac_cv_lib_socket___dn_skipname" = x""yes; then :
   found=yes
 else
   found=no
@@ -115108,50 +90503,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -115167,14 +90534,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DN_SKIPNAME 1
-_ACEOF
+$as_echo "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBSOCKET 1
-_ACEOF
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_dn_skipname=yes
   else
@@ -115200,172 +90563,12 @@ _ACEOF
   unset ac_cv_func___res_search
   unset found
 
-  { echo "$as_me:$LINENO: checking for res_search" >&5
-echo $ECHO_N "checking for res_search... $ECHO_C" >&6; }
-if test "${ac_cv_func_res_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define res_search to an innocuous variant, in case <limits.h> declares res_search.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define res_search innocuous_res_search
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char res_search (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef res_search
-
-/* 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 res_search ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_res_search || defined __stub___res_search
-choke me
-#endif
-
-int
-main ()
-{
-return res_search ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_res_search=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_res_search=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_res_search" >&5
-echo "${ECHO_T}$ac_cv_func_res_search" >&6; }
-if test $ac_cv_func_res_search = yes; then
+  ac_fn_c_check_func "$LINENO" "res_search" "ac_cv_func_res_search"
+if test "x$ac_cv_func_res_search" = x""yes; then :
   found=yes
 else
-   { echo "$as_me:$LINENO: checking for __res_search" >&5
-echo $ECHO_N "checking for __res_search... $ECHO_C" >&6; }
-if test "${ac_cv_func___res_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define __res_search to an innocuous variant, in case <limits.h> declares __res_search.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define __res_search innocuous___res_search
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char __res_search (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef __res_search
-
-/* 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 __res_search ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub___res_search || defined __stub_____res_search
-choke me
-#endif
-
-int
-main ()
-{
-return __res_search ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func___res_search=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func___res_search=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func___res_search" >&5
-echo "${ECHO_T}$ac_cv_func___res_search" >&6; }
-if test $ac_cv_func___res_search = yes; then
+   ac_fn_c_check_func "$LINENO" "__res_search" "ac_cv_func___res_search"
+if test "x$ac_cv_func___res_search" = x""yes; then :
   found=yes
 else
   found=no
@@ -115377,9 +90580,7 @@ fi
   case $found in
   yes)
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_RES_SEARCH 1
-_ACEOF
+$as_echo "#define HAVE_RES_SEARCH 1" >>confdefs.h
 
     ac_cv_func_res_search=yes
   ;;
@@ -115389,18 +90590,14 @@ _ACEOF
   unset ac_cv_lib_resolv_res_search
   unset ac_cv_lib_resolv___res_search
   unset found
-  { echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
-echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6; }
-if test "${ac_cv_lib_resolv_res_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5
+$as_echo_n "checking for res_search in -lresolv... " >&6; }
+if test "${ac_cv_lib_resolv_res_search+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -115418,54 +90615,29 @@ return res_search ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_res_search=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_resolv_res_search=no
+  ac_cv_lib_resolv_res_search=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6; }
-if test $ac_cv_lib_resolv_res_search = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5
+$as_echo "$ac_cv_lib_resolv_res_search" >&6; }
+if test "x$ac_cv_lib_resolv_res_search" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __res_search in -lresolv" >&5
-echo $ECHO_N "checking for __res_search in -lresolv... $ECHO_C" >&6; }
-if test "${ac_cv_lib_resolv___res_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lresolv" >&5
+$as_echo_n "checking for __res_search in -lresolv... " >&6; }
+if test "${ac_cv_lib_resolv___res_search+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -115483,39 +90655,18 @@ return __res_search ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv___res_search=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_resolv___res_search=no
+  ac_cv_lib_resolv___res_search=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___res_search" >&5
-echo "${ECHO_T}$ac_cv_lib_resolv___res_search" >&6; }
-if test $ac_cv_lib_resolv___res_search = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_search" >&5
+$as_echo "$ac_cv_lib_resolv___res_search" >&6; }
+if test "x$ac_cv_lib_resolv___res_search" = x""yes; then :
   found=yes
 else
   found=no
@@ -115528,50 +90679,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lresolv"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -115587,14 +90710,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_RES_SEARCH 1
-_ACEOF
+$as_echo "#define HAVE_RES_SEARCH 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBRESOLV 1
-_ACEOF
+$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_res_search=yes
   else
@@ -115603,18 +90722,14 @@ _ACEOF
   unset ac_cv_lib_bind_res_search
   unset ac_cv_lib_bind___res_search
   unset found
-  { echo "$as_me:$LINENO: checking for res_search in -lbind" >&5
-echo $ECHO_N "checking for res_search in -lbind... $ECHO_C" >&6; }
-if test "${ac_cv_lib_bind_res_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lbind" >&5
+$as_echo_n "checking for res_search in -lbind... " >&6; }
+if test "${ac_cv_lib_bind_res_search+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -115632,54 +90747,29 @@ return res_search ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_res_search=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_bind_res_search=no
+  ac_cv_lib_bind_res_search=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bind_res_search" >&5
-echo "${ECHO_T}$ac_cv_lib_bind_res_search" >&6; }
-if test $ac_cv_lib_bind_res_search = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_search" >&5
+$as_echo "$ac_cv_lib_bind_res_search" >&6; }
+if test "x$ac_cv_lib_bind_res_search" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __res_search in -lbind" >&5
-echo $ECHO_N "checking for __res_search in -lbind... $ECHO_C" >&6; }
-if test "${ac_cv_lib_bind___res_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lbind" >&5
+$as_echo_n "checking for __res_search in -lbind... " >&6; }
+if test "${ac_cv_lib_bind___res_search+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -115697,39 +90787,18 @@ return __res_search ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind___res_search=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_bind___res_search=no
+  ac_cv_lib_bind___res_search=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_bind___res_search" >&5
-echo "${ECHO_T}$ac_cv_lib_bind___res_search" >&6; }
-if test $ac_cv_lib_bind___res_search = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_search" >&5
+$as_echo "$ac_cv_lib_bind___res_search" >&6; }
+if test "x$ac_cv_lib_bind___res_search" = x""yes; then :
   found=yes
 else
   found=no
@@ -115742,50 +90811,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbind"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -115801,14 +90842,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_RES_SEARCH 1
-_ACEOF
+$as_echo "#define HAVE_RES_SEARCH 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBBIND 1
-_ACEOF
+$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_res_search=yes
   else
@@ -115817,18 +90854,14 @@ _ACEOF
   unset ac_cv_lib_socket_res_search
   unset ac_cv_lib_socket___res_search
   unset found
-  { echo "$as_me:$LINENO: checking for res_search in -lsocket" >&5
-echo $ECHO_N "checking for res_search in -lsocket... $ECHO_C" >&6; }
-if test "${ac_cv_lib_socket_res_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_search in -lsocket" >&5
+$as_echo_n "checking for res_search in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_res_search+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -115846,54 +90879,29 @@ return res_search ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_res_search=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket_res_search=no
+  ac_cv_lib_socket_res_search=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_res_search" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_res_search" >&6; }
-if test $ac_cv_lib_socket_res_search = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_search" >&5
+$as_echo "$ac_cv_lib_socket_res_search" >&6; }
+if test "x$ac_cv_lib_socket_res_search" = x""yes; then :
   found=yes
 else
 
-    { echo "$as_me:$LINENO: checking for __res_search in -lsocket" >&5
-echo $ECHO_N "checking for __res_search in -lsocket... $ECHO_C" >&6; }
-if test "${ac_cv_lib_socket___res_search+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lsocket" >&5
+$as_echo_n "checking for __res_search in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket___res_search+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -115911,39 +90919,18 @@ return __res_search ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___res_search=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket___res_search=no
+  ac_cv_lib_socket___res_search=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket___res_search" >&5
-echo "${ECHO_T}$ac_cv_lib_socket___res_search" >&6; }
-if test $ac_cv_lib_socket___res_search = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_search" >&5
+$as_echo "$ac_cv_lib_socket___res_search" >&6; }
+if test "x$ac_cv_lib_socket___res_search" = x""yes; then :
   found=yes
 else
   found=no
@@ -115956,50 +90943,22 @@ fi
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lsocket"
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
   found=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() { return (0); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-found=no
+  found=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_libs
   fi
 
@@ -116015,14 +90974,10 @@ fi
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_RES_SEARCH 1
-_ACEOF
+$as_echo "#define HAVE_RES_SEARCH 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBSOCKET 1
-_ACEOF
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_res_search=yes
   else
@@ -116042,22 +90997,18 @@ _ACEOF
   esac
 
 
-{ echo "$as_me:$LINENO: checking whether atof() accepts NAN" >&5
-echo $ECHO_N "checking whether atof() accepts NAN... $ECHO_C" >&6; }
-if test "${ac_cv_atof_accept_nan+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether atof() accepts NAN" >&5
+$as_echo_n "checking whether atof() accepts NAN... " >&6; }
+if test "${ac_cv_atof_accept_nan+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
 
   ac_cv_atof_accept_nan=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <math.h>
@@ -116077,70 +91028,40 @@ int main(int argc, char** argv)
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_atof_accept_nan=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
   ac_cv_atof_accept_nan=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_atof_accept_nan" >&5
-echo "${ECHO_T}$ac_cv_atof_accept_nan" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_atof_accept_nan" >&5
+$as_echo "$ac_cv_atof_accept_nan" >&6; }
 if test "$ac_cv_atof_accept_nan" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ATOF_ACCEPTS_NAN 1
-_ACEOF
+$as_echo "#define HAVE_ATOF_ACCEPTS_NAN 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking whether atof() accepts INF" >&5
-echo $ECHO_N "checking whether atof() accepts INF... $ECHO_C" >&6; }
-if test "${ac_cv_atof_accept_inf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether atof() accepts INF" >&5
+$as_echo_n "checking whether atof() accepts INF... " >&6; }
+if test "${ac_cv_atof_accept_inf+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
 
   ac_cv_atof_accept_inf=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <math.h>
@@ -116163,70 +91084,40 @@ int main(int argc, char** argv)
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_atof_accept_inf=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
   ac_cv_atof_accept_inf=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_atof_accept_inf" >&5
-echo "${ECHO_T}$ac_cv_atof_accept_inf" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_atof_accept_inf" >&5
+$as_echo "$ac_cv_atof_accept_inf" >&6; }
 if test "$ac_cv_atof_accept_inf" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ATOF_ACCEPTS_INF 1
-_ACEOF
+$as_echo "#define HAVE_ATOF_ACCEPTS_INF 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking whether HUGE_VAL == INF" >&5
-echo $ECHO_N "checking whether HUGE_VAL == INF... $ECHO_C" >&6; }
-if test "${ac_cv_huge_val_inf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether HUGE_VAL == INF" >&5
+$as_echo_n "checking whether HUGE_VAL == INF... " >&6; }
+if test "${ac_cv_huge_val_inf+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
 
   ac_cv_huge_val_inf=yes
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <math.h>
@@ -116249,70 +91140,40 @@ int main(int argc, char** argv)
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_huge_val_inf=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
   ac_cv_huge_val_inf=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_huge_val_inf" >&5
-echo "${ECHO_T}$ac_cv_huge_val_inf" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_huge_val_inf" >&5
+$as_echo "$ac_cv_huge_val_inf" >&6; }
 if test "$ac_cv_huge_val_inf" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_HUGE_VAL_INF 1
-_ACEOF
+$as_echo "#define HAVE_HUGE_VAL_INF 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5
-echo $ECHO_N "checking whether HUGE_VAL + -HUGEVAL == NAN... $ECHO_C" >&6; }
-if test "${ac_cv_huge_val_nan+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5
+$as_echo_n "checking whether HUGE_VAL + -HUGEVAL == NAN... " >&6; }
+if test "${ac_cv_huge_val_nan+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
 
   ac_cv_huge_val_nan=yes
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <math.h>
@@ -116337,65 +91198,35 @@ int main(int argc, char** argv)
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_huge_val_nan=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
   ac_cv_huge_val_nan=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_huge_val_nan" >&5
-echo "${ECHO_T}$ac_cv_huge_val_nan" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_huge_val_nan" >&5
+$as_echo "$ac_cv_huge_val_nan" >&6; }
 if test "$ac_cv_huge_val_nan" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_HUGE_VAL_NAN 1
-_ACEOF
+$as_echo "#define HAVE_HUGE_VAL_NAN 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking whether strptime() declaration fails" >&5
-echo $ECHO_N "checking whether strptime() declaration fails... $ECHO_C" >&6; }
-if test "${ac_cv_strptime_decl_fails+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strptime() declaration fails" >&5
+$as_echo_n "checking whether strptime() declaration fails... " >&6; }
+if test "${ac_cv_strptime_decl_fails+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <time.h>
@@ -116415,387 +91246,68 @@ int strptime(const char *s, const char *format, struct tm *tm);
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
   ac_cv_strptime_decl_fails=no
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
   ac_cv_strptime_decl_fails=yes
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_strptime_decl_fails" >&5
-echo "${ECHO_T}$ac_cv_strptime_decl_fails" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_strptime_decl_fails" >&5
+$as_echo "$ac_cv_strptime_decl_fails" >&6; }
 if test "$ac_cv_strptime_decl_fails" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRPTIME_DECL_FAILS 1
-_ACEOF
+$as_echo "#define HAVE_STRPTIME_DECL_FAILS 1" >>confdefs.h
 
 fi
 
-
 for ac_header in wchar.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+  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" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_WCHAR_H 1
 _ACEOF
 
 fi
 
 done
 
-
 for ac_func in mblen
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+do :
+  ac_fn_c_check_func "$LINENO" "mblen" "ac_cv_func_mblen"
+if test "x$ac_cv_func_mblen" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_MBLEN 1
 _ACEOF
 
 fi
 done
 
-
-
 for ac_func in mbrlen mbsinit
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+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"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
-{ echo "$as_me:$LINENO: checking for mbstate_t" >&5
-echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_mbstate_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
+$as_echo_n "checking for mbstate_t... " >&6; }
+if test "${ac_cv_type_mbstate_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HAVE_WCHAR_H
@@ -116812,181 +91324,31 @@ int __tmp__() { mbstate_t a; }
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
   ac_cv_type_mbstate_t=yes
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
   ac_cv_type_mbstate_t=no
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5
-echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5
+$as_echo "$ac_cv_type_mbstate_t" >&6; }
 if test "$ac_cv_type_mbstate_t" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MBSTATE_T 1
-_ACEOF
+$as_echo "#define HAVE_MBSTATE_T 1" >>confdefs.h
 
 fi
 
-
 for ac_header in atomic.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "atomic.h" "ac_cv_header_atomic_h" "$ac_includes_default"
+if test "x$ac_cv_header_atomic_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_ATOMIC_H 1
 _ACEOF
 
 fi
@@ -117357,11 +91719,11 @@ EOF
 
 php_with_sybase_ct=no
 
-{ echo "$as_me:$LINENO: checking for Sybase-CT support" >&5
-echo $ECHO_N "checking for Sybase-CT support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Sybase-CT support" >&5
+$as_echo_n "checking for Sybase-CT support... " >&6; }
 
 # Check whether --with-sybase-ct was given.
-if test "${with_sybase_ct+set}" = set; then
+if test "${with_sybase_ct+set}" = set; then :
   withval=$with_sybase_ct; PHP_SYBASE_CT=$withval
 else
 
@@ -117393,8 +91755,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -117402,15 +91764,11 @@ echo "${ECHO_T}$ext_output" >&6; }
 if test "$PHP_SYBASE_CT" != "no"; then
 
   if test "$PHP_SYBASE" && test "$PHP_SYBASE" != "no" && test "$ext_shared" = "no"; then
-    { { echo "$as_me:$LINENO: error: You can not use both --with-sybase and --with-sybase-ct in same build!" >&5
-echo "$as_me: error: You can not use both --with-sybase and --with-sybase-ct in same build!" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "You can not use both --with-sybase and --with-sybase-ct in same build!" "$LINENO" 5
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYBASE_CT 1
-_ACEOF
+$as_echo "#define HAVE_SYBASE_CT 1" >>confdefs.h
 
 
   ext_builddir=ext/sybase_ct
@@ -117717,403 +92075,32 @@ EOF
     SYBASE_CT_LIBDIR=$PHP_SYBASE_CT/lib
   fi
 
-    { echo "$as_me:$LINENO: checking for long int" >&5
-echo $ECHO_N "checking for long int... $ECHO_C" >&6; }
-if test "${ac_cv_type_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long int ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_long_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_int" >&5
-echo "${ECHO_T}$ac_cv_type_long_int" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
+    # 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.
-{ echo "$as_me:$LINENO: checking size of long int" >&5
-echo $ECHO_N "checking size of long int... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_long_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long int" >&5
+$as_echo_n "checking size of long int... " >&6; }
+if test "${ac_cv_sizeof_long_int+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long int))" "ac_cv_sizeof_long_int"        "$ac_includes_default"; then :
 
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_int=$ac_lo;;
-'') if test "$ac_cv_type_long_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_int=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long int ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_int=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_long_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_long_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long int)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_long_int=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_int" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_int" >&5
+$as_echo "$ac_cv_sizeof_long_int" >&6; }
 
 
 
@@ -118122,24 +92109,24 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-  { echo "$as_me:$LINENO: checking checking if we're on a 64-bit platform" >&5
-echo $ECHO_N "checking checking if we're on a 64-bit platform... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking checking if we're on a 64-bit platform" >&5
+$as_echo_n "checking checking if we're on a 64-bit platform... " >&6; }
   if test "$ac_cv_sizeof_long_int" = "4"; then
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     PHP_SYBASE_64=no
   else
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     PHP_SYBASE_64=yes
   fi
 
 
-  { echo "$as_me:$LINENO: checking Checking for ctpublic.h" >&5
-echo $ECHO_N "checking Checking for ctpublic.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Checking for ctpublic.h" >&5
+$as_echo_n "checking Checking for ctpublic.h... " >&6; }
   if test -f $SYBASE_CT_INCDIR/ctpublic.h; then
-    { echo "$as_me:$LINENO: result: found in $SYBASE_CT_INCDIR" >&5
-echo "${ECHO_T}found in $SYBASE_CT_INCDIR" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $SYBASE_CT_INCDIR" >&5
+$as_echo "found in $SYBASE_CT_INCDIR" >&6; }
 
   if test "$SYBASE_CT_INCDIR" != "/usr/include"; then
 
@@ -118147,10 +92134,10 @@ echo "${ECHO_T}found in $SYBASE_CT_INCDIR" >&6; }
     ai_p=$SYBASE_CT_INCDIR
   else
 
-    ep_dir="`echo $SYBASE_CT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $SYBASE_CT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$SYBASE_CT_INCDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$SYBASE_CT_INCDIR"`
   fi
 
 
@@ -118172,18 +92159,16 @@ echo "${ECHO_T}found in $SYBASE_CT_INCDIR" >&6; }
   fi
 
   else
-    { { echo "$as_me:$LINENO: error: ctpublic.h missing!" >&5
-echo "$as_me: error: ctpublic.h missing!" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "ctpublic.h missing!" "$LINENO" 5
   fi
 
-  { echo "$as_me:$LINENO: checking Checking Sybase libdir" >&5
-echo $ECHO_N "checking Checking Sybase libdir... $ECHO_C" >&6; }
-  { echo "$as_me:$LINENO: result: Have $SYBASE_CT_LIBDIR" >&5
-echo "${ECHO_T}Have $SYBASE_CT_LIBDIR" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Checking Sybase libdir" >&5
+$as_echo_n "checking Checking Sybase libdir... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Have $SYBASE_CT_LIBDIR" >&5
+$as_echo "Have $SYBASE_CT_LIBDIR" >&6; }
 
-  { echo "$as_me:$LINENO: checking Checking for Sybase platform libraries" >&5
-echo $ECHO_N "checking Checking for Sybase platform libraries... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Checking for Sybase platform libraries" >&5
+$as_echo_n "checking Checking for Sybase platform libraries... " >&6; }
 
 
   if test "$SYBASE_CT_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SYBASE_CT_LIBDIR" != "/usr/lib"; then
@@ -118192,10 +92177,10 @@ echo $ECHO_N "checking Checking for Sybase platform libraries... $ECHO_C" >&6; }
     ai_p=$SYBASE_CT_LIBDIR
   else
 
-    ep_dir="`echo $SYBASE_CT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $SYBASE_CT_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$SYBASE_CT_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$SYBASE_CT_LIBDIR"`
   fi
 
 
@@ -118248,8 +92233,8 @@ echo $ECHO_N "checking Checking for Sybase platform libraries... $ECHO_C" >&6; }
 
 
     SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
-    { echo "$as_me:$LINENO: result: FreeTDS: $SYBASE_CT_LIBS" >&5
-echo "${ECHO_T}FreeTDS: $SYBASE_CT_LIBS" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: FreeTDS: $SYBASE_CT_LIBS" >&5
+$as_echo "FreeTDS: $SYBASE_CT_LIBS" >&6; }
   elif test -f $SYBASE_CT_LIBDIR/libsybct64.so && test $PHP_SYBASE_64 = "yes"; then
 
 
@@ -118350,8 +92335,8 @@ echo "${ECHO_T}FreeTDS: $SYBASE_CT_LIBS" >&6; }
       *) CFLAGS="${CFLAGS} -DSYB_LP64"  ;; #
     esac
     SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs64 -lsybct64 -lsybcomn64 -lsybintl64"
-    { echo "$as_me:$LINENO: result: Sybase64: $SYBASE_CT_LIBS" >&5
-echo "${ECHO_T}Sybase64: $SYBASE_CT_LIBS" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sybase64: $SYBASE_CT_LIBS" >&5
+$as_echo "Sybase64: $SYBASE_CT_LIBS" >&6; }
 
 
   save_old_LDFLAGS=$LDFLAGS
@@ -118415,10 +92400,10 @@ echo "${ECHO_T}Sybase64: $SYBASE_CT_LIBS" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -118450,18 +92435,14 @@ echo "${ECHO_T}Sybase64: $SYBASE_CT_LIBS" >&6; }
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for netg_errstr in -lsybtcl64" >&5
-echo $ECHO_N "checking for netg_errstr in -lsybtcl64... $ECHO_C" >&6; }
-if test "${ac_cv_lib_sybtcl64_netg_errstr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for netg_errstr in -lsybtcl64" >&5
+$as_echo_n "checking for netg_errstr in -lsybtcl64... " >&6; }
+if test "${ac_cv_lib_sybtcl64_netg_errstr+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsybtcl64  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -118479,39 +92460,18 @@ return netg_errstr ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sybtcl64_netg_errstr=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_sybtcl64_netg_errstr=no
+  ac_cv_lib_sybtcl64_netg_errstr=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_sybtcl64_netg_errstr" >&5
-echo "${ECHO_T}$ac_cv_lib_sybtcl64_netg_errstr" >&6; }
-if test $ac_cv_lib_sybtcl64_netg_errstr = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sybtcl64_netg_errstr" >&5
+$as_echo "$ac_cv_lib_sybtcl64_netg_errstr" >&6; }
+if test "x$ac_cv_lib_sybtcl64_netg_errstr" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -118635,10 +92595,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -118670,18 +92630,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for insck__getVdate in -linsck64" >&5
-echo $ECHO_N "checking for insck__getVdate in -linsck64... $ECHO_C" >&6; }
-if test "${ac_cv_lib_insck64_insck__getVdate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for insck__getVdate in -linsck64" >&5
+$as_echo_n "checking for insck__getVdate in -linsck64... " >&6; }
+if test "${ac_cv_lib_insck64_insck__getVdate+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linsck64  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -118699,39 +92655,18 @@ return insck__getVdate ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_insck64_insck__getVdate=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_insck64_insck__getVdate=no
+  ac_cv_lib_insck64_insck__getVdate=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_insck64_insck__getVdate" >&5
-echo "${ECHO_T}$ac_cv_lib_insck64_insck__getVdate" >&6; }
-if test $ac_cv_lib_insck64_insck__getVdate = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_insck64_insck__getVdate" >&5
+$as_echo "$ac_cv_lib_insck64_insck__getVdate" >&6; }
+if test "x$ac_cv_lib_insck64_insck__getVdate" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -118828,10 +92763,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -118863,18 +92798,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for bsd_tcp in -linsck64" >&5
-echo $ECHO_N "checking for bsd_tcp in -linsck64... $ECHO_C" >&6; }
-if test "${ac_cv_lib_insck64_bsd_tcp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bsd_tcp in -linsck64" >&5
+$as_echo_n "checking for bsd_tcp in -linsck64... " >&6; }
+if test "${ac_cv_lib_insck64_bsd_tcp+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linsck64  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -118892,39 +92823,18 @@ return bsd_tcp ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_insck64_bsd_tcp=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_insck64_bsd_tcp=no
+  ac_cv_lib_insck64_bsd_tcp=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_insck64_bsd_tcp" >&5
-echo "${ECHO_T}$ac_cv_lib_insck64_bsd_tcp" >&6; }
-if test $ac_cv_lib_insck64_bsd_tcp = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_insck64_bsd_tcp" >&5
+$as_echo "$ac_cv_lib_insck64_bsd_tcp" >&6; }
+if test "x$ac_cv_lib_insck64_bsd_tcp" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -119056,8 +92966,8 @@ fi
 
 
     SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs -lsybct -lsybcomn -lsybintl"
-    { echo "$as_me:$LINENO: result: Sybase32 syb-prefix: $SYBASE_CT_LIBS" >&5
-echo "${ECHO_T}Sybase32 syb-prefix: $SYBASE_CT_LIBS" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sybase32 syb-prefix: $SYBASE_CT_LIBS" >&5
+$as_echo "Sybase32 syb-prefix: $SYBASE_CT_LIBS" >&6; }
 
 
   save_old_LDFLAGS=$LDFLAGS
@@ -119121,10 +93031,10 @@ echo "${ECHO_T}Sybase32 syb-prefix: $SYBASE_CT_LIBS" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -119156,18 +93066,14 @@ echo "${ECHO_T}Sybase32 syb-prefix: $SYBASE_CT_LIBS" >&6; }
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for netg_errstr in -lsybtcl" >&5
-echo $ECHO_N "checking for netg_errstr in -lsybtcl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_sybtcl_netg_errstr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for netg_errstr in -lsybtcl" >&5
+$as_echo_n "checking for netg_errstr in -lsybtcl... " >&6; }
+if test "${ac_cv_lib_sybtcl_netg_errstr+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsybtcl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -119185,39 +93091,18 @@ return netg_errstr ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sybtcl_netg_errstr=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_sybtcl_netg_errstr=no
+  ac_cv_lib_sybtcl_netg_errstr=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_sybtcl_netg_errstr" >&5
-echo "${ECHO_T}$ac_cv_lib_sybtcl_netg_errstr" >&6; }
-if test $ac_cv_lib_sybtcl_netg_errstr = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sybtcl_netg_errstr" >&5
+$as_echo "$ac_cv_lib_sybtcl_netg_errstr" >&6; }
+if test "x$ac_cv_lib_sybtcl_netg_errstr" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -119341,10 +93226,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -119376,18 +93261,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for insck__getVdate in -linsck" >&5
-echo $ECHO_N "checking for insck__getVdate in -linsck... $ECHO_C" >&6; }
-if test "${ac_cv_lib_insck_insck__getVdate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for insck__getVdate in -linsck" >&5
+$as_echo_n "checking for insck__getVdate in -linsck... " >&6; }
+if test "${ac_cv_lib_insck_insck__getVdate+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linsck  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -119405,39 +93286,18 @@ return insck__getVdate ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_insck_insck__getVdate=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_insck_insck__getVdate=no
+  ac_cv_lib_insck_insck__getVdate=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_insck_insck__getVdate" >&5
-echo "${ECHO_T}$ac_cv_lib_insck_insck__getVdate" >&6; }
-if test $ac_cv_lib_insck_insck__getVdate = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_insck_insck__getVdate" >&5
+$as_echo "$ac_cv_lib_insck_insck__getVdate" >&6; }
+if test "x$ac_cv_lib_insck_insck__getVdate" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -119534,10 +93394,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -119569,18 +93429,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for bsd_tcp in -linsck" >&5
-echo $ECHO_N "checking for bsd_tcp in -linsck... $ECHO_C" >&6; }
-if test "${ac_cv_lib_insck_bsd_tcp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bsd_tcp in -linsck" >&5
+$as_echo_n "checking for bsd_tcp in -linsck... " >&6; }
+if test "${ac_cv_lib_insck_bsd_tcp+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linsck  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -119598,39 +93454,18 @@ return bsd_tcp ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_insck_bsd_tcp=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_insck_bsd_tcp=no
+  ac_cv_lib_insck_bsd_tcp=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_insck_bsd_tcp" >&5
-echo "${ECHO_T}$ac_cv_lib_insck_bsd_tcp" >&6; }
-if test $ac_cv_lib_insck_bsd_tcp = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_insck_bsd_tcp" >&5
+$as_echo "$ac_cv_lib_insck_bsd_tcp" >&6; }
+if test "x$ac_cv_lib_insck_bsd_tcp" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -119762,8 +93597,8 @@ fi
 
 
     SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
-    { echo "$as_me:$LINENO: result: Sybase32 default: $SYBASE_CT_LIBS" >&5
-echo "${ECHO_T}Sybase32 default: $SYBASE_CT_LIBS" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sybase32 default: $SYBASE_CT_LIBS" >&5
+$as_echo "Sybase32 default: $SYBASE_CT_LIBS" >&6; }
 
 
   save_old_LDFLAGS=$LDFLAGS
@@ -119827,10 +93662,10 @@ echo "${ECHO_T}Sybase32 default: $SYBASE_CT_LIBS" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -119862,18 +93697,14 @@ echo "${ECHO_T}Sybase32 default: $SYBASE_CT_LIBS" >&6; }
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for netg_errstr in -ltcl" >&5
-echo $ECHO_N "checking for netg_errstr in -ltcl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_tcl_netg_errstr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for netg_errstr in -ltcl" >&5
+$as_echo_n "checking for netg_errstr in -ltcl... " >&6; }
+if test "${ac_cv_lib_tcl_netg_errstr+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltcl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -119891,39 +93722,18 @@ return netg_errstr ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_tcl_netg_errstr=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_tcl_netg_errstr=no
+  ac_cv_lib_tcl_netg_errstr=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_tcl_netg_errstr" >&5
-echo "${ECHO_T}$ac_cv_lib_tcl_netg_errstr" >&6; }
-if test $ac_cv_lib_tcl_netg_errstr = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tcl_netg_errstr" >&5
+$as_echo "$ac_cv_lib_tcl_netg_errstr" >&6; }
+if test "x$ac_cv_lib_tcl_netg_errstr" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -120047,10 +93857,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -120082,18 +93892,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for insck__getVdate in -linsck" >&5
-echo $ECHO_N "checking for insck__getVdate in -linsck... $ECHO_C" >&6; }
-if test "${ac_cv_lib_insck_insck__getVdate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for insck__getVdate in -linsck" >&5
+$as_echo_n "checking for insck__getVdate in -linsck... " >&6; }
+if test "${ac_cv_lib_insck_insck__getVdate+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linsck  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -120111,39 +93917,18 @@ return insck__getVdate ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_insck_insck__getVdate=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_insck_insck__getVdate=no
+  ac_cv_lib_insck_insck__getVdate=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_insck_insck__getVdate" >&5
-echo "${ECHO_T}$ac_cv_lib_insck_insck__getVdate" >&6; }
-if test $ac_cv_lib_insck_insck__getVdate = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_insck_insck__getVdate" >&5
+$as_echo "$ac_cv_lib_insck_insck__getVdate" >&6; }
+if test "x$ac_cv_lib_insck_insck__getVdate" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -120240,10 +94025,10 @@ fi
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -120275,18 +94060,14 @@ fi
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for bsd_tcp in -linsck" >&5
-echo $ECHO_N "checking for bsd_tcp in -linsck... $ECHO_C" >&6; }
-if test "${ac_cv_lib_insck_bsd_tcp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bsd_tcp in -linsck" >&5
+$as_echo_n "checking for bsd_tcp in -linsck... " >&6; }
+if test "${ac_cv_lib_insck_bsd_tcp+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linsck  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -120304,39 +94085,18 @@ return bsd_tcp ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_insck_bsd_tcp=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_insck_bsd_tcp=no
+  ac_cv_lib_insck_bsd_tcp=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_insck_bsd_tcp" >&5
-echo "${ECHO_T}$ac_cv_lib_insck_bsd_tcp" >&6; }
-if test $ac_cv_lib_insck_bsd_tcp = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_insck_bsd_tcp" >&5
+$as_echo "$ac_cv_lib_insck_bsd_tcp" >&6; }
+if test "x$ac_cv_lib_insck_bsd_tcp" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -120380,10 +94140,10 @@ fi
 
 php_enable_sysvmsg=no
 
-{ echo "$as_me:$LINENO: checking whether to enable System V IPC support" >&5
-echo $ECHO_N "checking whether to enable System V IPC support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable System V IPC support" >&5
+$as_echo_n "checking whether to enable System V IPC support... " >&6; }
 # Check whether --enable-sysvmsg was given.
-if test "${enable_sysvmsg+set}" = set; then
+if test "${enable_sysvmsg+set}" = set; then :
   enableval=$enable_sysvmsg; PHP_SYSVMSG=$enableval
 else
 
@@ -120415,153 +94175,25 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_SYSVMSG" != "no"; then
-  if test "${ac_cv_header_sys_msg_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for sys/msg.h" >&5
-echo $ECHO_N "checking for sys/msg.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_msg_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_msg_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_msg_h" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking sys/msg.h usability" >&5
-echo $ECHO_N "checking sys/msg.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <sys/msg.h>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/msg.h" "ac_cv_header_sys_msg_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_msg_h" = x""yes; then :
 
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking sys/msg.h presence" >&5
-echo $ECHO_N "checking sys/msg.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/msg.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: sys/msg.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: sys/msg.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/msg.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: sys/msg.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: sys/msg.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: sys/msg.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/msg.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: sys/msg.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/msg.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: sys/msg.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/msg.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: sys/msg.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/msg.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: sys/msg.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sys/msg.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: sys/msg.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for sys/msg.h" >&5
-echo $ECHO_N "checking for sys/msg.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_msg_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_sys_msg_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_msg_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_msg_h" >&6; }
-
-fi
-if test $ac_cv_header_sys_msg_h = yes; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: Cannot enable System V IPC support, sys/msg.h is missing" >&5
-echo "$as_me: error: Cannot enable System V IPC support, sys/msg.h is missing" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "Cannot enable System V IPC support, sys/msg.h is missing" "$LINENO" 5
 
 fi
 
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYSVMSG 1
-_ACEOF
+$as_echo "#define HAVE_SYSVMSG 1" >>confdefs.h
 
 
   ext_builddir=ext/sysvmsg
@@ -120862,10 +94494,10 @@ fi
 
 php_enable_sysvsem=no
 
-{ echo "$as_me:$LINENO: checking whether to enable System V semaphore support" >&5
-echo $ECHO_N "checking whether to enable System V semaphore support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable System V semaphore support" >&5
+$as_echo_n "checking whether to enable System V semaphore support... " >&6; }
 # Check whether --enable-sysvsem was given.
-if test "${enable_sysvsem+set}" = set; then
+if test "${enable_sysvsem+set}" = set; then :
   enableval=$enable_sysvsem; PHP_SYSVSEM=$enableval
 else
 
@@ -120897,8 +94529,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -121198,20 +94830,14 @@ EOF
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYSVSEM 1
-_ACEOF
+$as_echo "#define HAVE_SYSVSEM 1" >>confdefs.h
 
- { echo "$as_me:$LINENO: checking for union semun" >&5
-echo $ECHO_N "checking for union semun... $ECHO_C" >&6; }
-if test "${php_cv_semun+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for union semun" >&5
+$as_echo_n "checking for union semun... " >&6; }
+if test "${php_cv_semun+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -121226,51 +94852,27 @@ union semun x;
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
      php_cv_semun=yes
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
      php_cv_semun=no
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ echo "$as_me:$LINENO: result: $php_cv_semun" >&5
-echo "${ECHO_T}$php_cv_semun" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_semun" >&5
+$as_echo "$php_cv_semun" >&6; }
  if test "$php_cv_semun" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SEMUN 1
-_ACEOF
+$as_echo "#define HAVE_SEMUN 1" >>confdefs.h
 
  else
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SEMUN 0
-_ACEOF
+$as_echo "#define HAVE_SEMUN 0" >>confdefs.h
 
  fi
 fi
@@ -121279,10 +94881,10 @@ fi
 
 php_enable_sysvshm=no
 
-{ echo "$as_me:$LINENO: checking whether to enable System V shared memory support" >&5
-echo $ECHO_N "checking whether to enable System V shared memory support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable System V shared memory support" >&5
+$as_echo_n "checking whether to enable System V shared memory support... " >&6; }
 # Check whether --enable-sysvshm was given.
-if test "${enable_sysvshm+set}" = set; then
+if test "${enable_sysvshm+set}" = set; then :
   enableval=$enable_sysvshm; PHP_SYSVSHM=$enableval
 else
 
@@ -121314,17 +94916,15 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_SYSVSHM" != "no"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYSVSHM 1
-_ACEOF
+$as_echo "#define HAVE_SYSVSHM 1" >>confdefs.h
 
 
   ext_builddir=ext/sysvshm
@@ -121625,11 +95225,11 @@ fi
 
 php_with_tidy=no
 
-{ echo "$as_me:$LINENO: checking for TIDY support" >&5
-echo $ECHO_N "checking for TIDY support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIDY support" >&5
+$as_echo_n "checking for TIDY support... " >&6; }
 
 # Check whether --with-tidy was given.
-if test "${with_tidy+set}" = set; then
+if test "${with_tidy+set}" = set; then :
   withval=$with_tidy; PHP_TIDY=$withval
 else
 
@@ -121661,8 +95261,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -121686,9 +95286,7 @@ if test "$PHP_TIDY" != "no"; then
   done
 
   if test -z "$TIDY_DIR"; then
-    { { echo "$as_me:$LINENO: error: Cannot find libtidy" >&5
-echo "$as_me: error: Cannot find libtidy" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Cannot find libtidy" "$LINENO" 5
   fi
 
   TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR
@@ -121705,10 +95303,10 @@ echo "$as_me: error: Cannot find libtidy" >&2;}
     ai_p=$TIDY_LIBDIR
   else
 
-    ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$TIDY_LIBDIR"`
   fi
 
 
@@ -121748,10 +95346,10 @@ echo "$as_me: error: Cannot find libtidy" >&2;}
     ai_p=$TIDY_LIBDIR
   else
 
-    ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$TIDY_LIBDIR"`
   fi
 
 
@@ -121797,10 +95395,10 @@ echo "$as_me: error: Cannot find libtidy" >&2;}
     ai_p=$TIDY_INCDIR
   else
 
-    ep_dir="`echo $TIDY_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $TIDY_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$TIDY_INCDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$TIDY_INCDIR"`
   fi
 
 
@@ -121882,10 +95480,10 @@ echo "$as_me: error: Cannot find libtidy" >&2;}
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -121917,18 +95515,14 @@ echo "$as_me: error: Cannot find libtidy" >&2;}
     esac
   done
 
-  { echo "$as_me:$LINENO: checking for tidyOptGetDoc in -ltidy" >&5
-echo $ECHO_N "checking for tidyOptGetDoc in -ltidy... $ECHO_C" >&6; }
-if test "${ac_cv_lib_tidy_tidyOptGetDoc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tidyOptGetDoc in -ltidy" >&5
+$as_echo_n "checking for tidyOptGetDoc in -ltidy... " >&6; }
+if test "${ac_cv_lib_tidy_tidyOptGetDoc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltidy  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -121946,47 +95540,24 @@ return tidyOptGetDoc ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_tidy_tidyOptGetDoc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_tidy_tidyOptGetDoc=no
+  ac_cv_lib_tidy_tidyOptGetDoc=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_tidy_tidyOptGetDoc" >&5
-echo "${ECHO_T}$ac_cv_lib_tidy_tidyOptGetDoc" >&6; }
-if test $ac_cv_lib_tidy_tidyOptGetDoc = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tidy_tidyOptGetDoc" >&5
+$as_echo "$ac_cv_lib_tidy_tidyOptGetDoc" >&6; }
+if test "x$ac_cv_lib_tidy_tidyOptGetDoc" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_TIDYOPTGETDOC 1
-_ACEOF
+$as_echo "#define HAVE_TIDYOPTGETDOC 1" >>confdefs.h
 
 
 
@@ -122298,9 +95869,7 @@ EOF
   PHP_VAR_SUBST="$PHP_VAR_SUBST TIDY_SHARED_LIBADD"
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_TIDY 1
-_ACEOF
+$as_echo "#define HAVE_TIDY 1" >>confdefs.h
 
 fi
 
@@ -122309,10 +95878,10 @@ fi
 
 php_enable_tokenizer=yes
 
-{ echo "$as_me:$LINENO: checking whether to enable tokenizer support" >&5
-echo $ECHO_N "checking whether to enable tokenizer support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable tokenizer support" >&5
+$as_echo_n "checking whether to enable tokenizer support... " >&6; }
 # Check whether --enable-tokenizer was given.
-if test "${enable_tokenizer+set}" = set; then
+if test "${enable_tokenizer+set}" = set; then :
   enableval=$enable_tokenizer; PHP_TOKENIZER=$enableval
 else
 
@@ -122344,8 +95913,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -122656,10 +96225,10 @@ fi
 
 php_enable_wddx=no
 
-{ echo "$as_me:$LINENO: checking whether to enable WDDX support" >&5
-echo $ECHO_N "checking whether to enable WDDX support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable WDDX support" >&5
+$as_echo_n "checking whether to enable WDDX support... " >&6; }
 # Check whether --enable-wddx was given.
-if test "${enable_wddx+set}" = set; then
+if test "${enable_wddx+set}" = set; then :
   enableval=$enable_wddx; PHP_WDDX=$enableval
 else
 
@@ -122691,8 +96260,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -122701,11 +96270,11 @@ if test -z "$PHP_LIBXML_DIR"; then
 
 php_with_libxml_dir=no
 
-{ echo "$as_me:$LINENO: checking libxml2 install dir" >&5
-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml2 install dir" >&5
+$as_echo_n "checking libxml2 install dir... " >&6; }
 
 # Check whether --with-libxml-dir was given.
-if test "${with_libxml_dir+set}" = set; then
+if test "${with_libxml_dir+set}" = set; then :
   withval=$with_libxml_dir; PHP_LIBXML_DIR=$withval
 else
 
@@ -122716,8 +96285,8 @@ fi
 
 
 ext_output=$PHP_LIBXML_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -122726,11 +96295,11 @@ fi
 
 php_with_libexpat_dir=no
 
-{ echo "$as_me:$LINENO: checking libexpat dir for WDDX" >&5
-echo $ECHO_N "checking libexpat dir for WDDX... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libexpat dir for WDDX" >&5
+$as_echo_n "checking libexpat dir for WDDX... " >&6; }
 
 # Check whether --with-libexpat-dir was given.
-if test "${with_libexpat_dir+set}" = set; then
+if test "${with_libexpat_dir+set}" = set; then :
   withval=$with_libexpat_dir; PHP_LIBEXPAT_DIR=$withval
 else
 
@@ -122741,8 +96310,8 @@ fi
 
 
 ext_output=$PHP_LIBEXPAT_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -122751,16 +96320,14 @@ if test "$PHP_WDDX" != "no"; then
 
         if test "$PHP_LIBEXPAT_DIR" = "no"; then
     if test "$PHP_LIBXML" = "no"; then
-      { { echo "$as_me:$LINENO: error: WDDX extension requires LIBXML extension, add --enable-libxml" >&5
-echo "$as_me: error: WDDX extension requires LIBXML extension, add --enable-libxml" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "WDDX extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5
     fi
 
 
-{ echo "$as_me:$LINENO: checking for xml2-config path" >&5
-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6; }
-if test "${ac_cv_php_xml2_config_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5
+$as_echo_n "checking for xml2-config path... " >&6; }
+if test "${ac_cv_php_xml2_config_path+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
   for i in $PHP_LIBXML_DIR /usr/local /usr; do
@@ -122771,8 +96338,8 @@ else
   done
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5
-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_xml2_config_path" >&5
+$as_echo "$ac_cv_php_xml2_config_path" >&6; }
 
   if test -x "$ac_cv_php_xml2_config_path"; then
     XML2_CONFIG="$ac_cv_php_xml2_config_path"
@@ -122839,10 +96406,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -122886,10 +96453,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -122915,10 +96482,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
   done
 
 
-            { echo "$as_me:$LINENO: checking whether libxml build works" >&5
-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6; }
-if test "${php_cv_libxml_build_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5
+$as_echo_n "checking whether libxml build works... " >&6; }
+if test "${php_cv_libxml_build_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -122926,16 +96493,12 @@ else
   LIBS="
           $WDDX_SHARED_LIBADD
          $LIBS"
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
     LIBS=$old_LIBS
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -122946,26 +96509,7 @@ cat >>conftest.$ac_ext <<_ACEOF
     }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     LIBS=$old_LIBS
 
@@ -122973,36 +96517,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     LIBS=$old_LIBS
 
-          { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-          { { echo "$as_me:$LINENO: error: build test failed.  Please check the config.log for details." >&5
-echo "$as_me: error: build test failed.  Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          as_fn_error "build test failed.  Please check the config.log for details." "$LINENO" 5
 
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
 
-
 fi
-{ echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5
-echo "${ECHO_T}$php_cv_libxml_build_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_libxml_build_works" >&5
+$as_echo "$php_cv_libxml_build_works" >&6; }
       if test "$php_cv_libxml_build_works" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBXML 1
-_ACEOF
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
       fi
 
@@ -123058,14 +96593,10 @@ EOF
       fi
 
     else
-      { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5
-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "libxml2 version 2.6.11 or greater required." "$LINENO" 5
     fi
 else
-      { { echo "$as_me:$LINENO: error: xml2-config not found. Use --with-libxml-dir=<DIR>" >&5
-echo "$as_me: error: xml2-config not found. Use --with-libxml-dir=<DIR>" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "xml2-config not found. Use --with-libxml-dir=<DIR>" "$LINENO" 5
 
   fi
 
@@ -123080,9 +96611,7 @@ echo "$as_me: error: xml2-config not found. Use --with-libxml-dir=<DIR>" >&2;}
     done
 
     if test -z "$EXPAT_DIR"; then
-      { { echo "$as_me:$LINENO: error: not found. Please reinstall the expat distribution." >&5
-echo "$as_me: error: not found. Please reinstall the expat distribution." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "not found. Please reinstall the expat distribution." "$LINENO" 5
     fi
 
 
@@ -123092,10 +96621,10 @@ echo "$as_me: error: not found. Please reinstall the expat distribution." >&2;}
     ai_p=$EXPAT_DIR/include
   else
 
-    ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$EXPAT_DIR/include"`
   fi
 
 
@@ -123128,10 +96657,10 @@ echo "$as_me: error: not found. Please reinstall the expat distribution." >&2;}
     ai_p=$EXPAT_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$EXPAT_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -123171,10 +96700,10 @@ echo "$as_me: error: not found. Please reinstall the expat distribution." >&2;}
     ai_p=$EXPAT_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$EXPAT_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -123214,16 +96743,12 @@ echo "$as_me: error: not found. Please reinstall the expat distribution." >&2;}
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBEXPAT 1
-_ACEOF
+$as_echo "#define HAVE_LIBEXPAT 1" >>confdefs.h
 
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WDDX 1
-_ACEOF
+$as_echo "#define HAVE_WDDX 1" >>confdefs.h
 
 
   ext_builddir=ext/wddx
@@ -123523,30 +97048,18 @@ EOF
   is_it_shared=$PHP_LIBXML_SHARED
   is_it_enabled=$PHP_LIBXML
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension wddx to build statically, but it
 depends on extension libxml, which you've configured to build shared.
 You either need to build wddx shared or build libxml statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension wddx to build statically, but it
-depends on extension libxml, which you've configured to build shared.
-You either need to build wddx shared or build libxml statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension wddx, which depends on extension libxml,
-but you've either not enabled libxml, or have disabled it.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension wddx, which depends on extension libxml,
 but you've either not enabled libxml, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 
@@ -123558,10 +97071,10 @@ fi
 
 php_enable_xml=yes
 
-{ echo "$as_me:$LINENO: checking whether to enable XML support" >&5
-echo $ECHO_N "checking whether to enable XML support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable XML support" >&5
+$as_echo_n "checking whether to enable XML support... " >&6; }
 # Check whether --enable-xml was given.
-if test "${enable_xml+set}" = set; then
+if test "${enable_xml+set}" = set; then :
   enableval=$enable_xml; PHP_XML=$enableval
 else
 
@@ -123593,8 +97106,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -123603,11 +97116,11 @@ if test -z "$PHP_LIBXML_DIR"; then
 
 php_with_libxml_dir=no
 
-{ echo "$as_me:$LINENO: checking libxml2 install dir" >&5
-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml2 install dir" >&5
+$as_echo_n "checking libxml2 install dir... " >&6; }
 
 # Check whether --with-libxml-dir was given.
-if test "${with_libxml_dir+set}" = set; then
+if test "${with_libxml_dir+set}" = set; then :
   withval=$with_libxml_dir; PHP_LIBXML_DIR=$withval
 else
 
@@ -123618,8 +97131,8 @@ fi
 
 
 ext_output=$PHP_LIBXML_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -123628,11 +97141,11 @@ fi
 
 php_with_libexpat_dir=no
 
-{ echo "$as_me:$LINENO: checking libexpat install dir" >&5
-echo $ECHO_N "checking libexpat install dir... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libexpat install dir" >&5
+$as_echo_n "checking libexpat install dir... " >&6; }
 
 # Check whether --with-libexpat-dir was given.
-if test "${with_libexpat_dir+set}" = set; then
+if test "${with_libexpat_dir+set}" = set; then :
   withval=$with_libexpat_dir; PHP_LIBEXPAT_DIR=$withval
 else
 
@@ -123643,8 +97156,8 @@ fi
 
 
 ext_output=$PHP_LIBEXPAT_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -123654,16 +97167,14 @@ if test "$PHP_XML" != "no"; then
         if test "$PHP_LIBEXPAT_DIR" = "no"; then
 
     if test "$PHP_LIBXML" = "no"; then
-      { { echo "$as_me:$LINENO: error: XML extension requires LIBXML extension, add --enable-libxml" >&5
-echo "$as_me: error: XML extension requires LIBXML extension, add --enable-libxml" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "XML extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5
     fi
 
 
-{ echo "$as_me:$LINENO: checking for xml2-config path" >&5
-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6; }
-if test "${ac_cv_php_xml2_config_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5
+$as_echo_n "checking for xml2-config path... " >&6; }
+if test "${ac_cv_php_xml2_config_path+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
   for i in $PHP_LIBXML_DIR /usr/local /usr; do
@@ -123674,8 +97185,8 @@ else
   done
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5
-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_xml2_config_path" >&5
+$as_echo "$ac_cv_php_xml2_config_path" >&6; }
 
   if test -x "$ac_cv_php_xml2_config_path"; then
     XML2_CONFIG="$ac_cv_php_xml2_config_path"
@@ -123742,10 +97253,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -123789,10 +97300,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -123818,10 +97329,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
   done
 
 
-            { echo "$as_me:$LINENO: checking whether libxml build works" >&5
-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6; }
-if test "${php_cv_libxml_build_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5
+$as_echo_n "checking whether libxml build works... " >&6; }
+if test "${php_cv_libxml_build_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -123829,16 +97340,12 @@ else
   LIBS="
           $XML_SHARED_LIBADD
          $LIBS"
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
     LIBS=$old_LIBS
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -123849,26 +97356,7 @@ cat >>conftest.$ac_ext <<_ACEOF
     }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     LIBS=$old_LIBS
 
@@ -123876,36 +97364,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     LIBS=$old_LIBS
 
-          { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-          { { echo "$as_me:$LINENO: error: build test failed.  Please check the config.log for details." >&5
-echo "$as_me: error: build test failed.  Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          as_fn_error "build test failed.  Please check the config.log for details." "$LINENO" 5
 
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
 
-
 fi
-{ echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5
-echo "${ECHO_T}$php_cv_libxml_build_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_libxml_build_works" >&5
+$as_echo "$php_cv_libxml_build_works" >&6; }
       if test "$php_cv_libxml_build_works" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBXML 1
-_ACEOF
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
       fi
 
@@ -123915,42 +97394,26 @@ _ACEOF
   is_it_shared=$PHP_LIBXML_SHARED
   is_it_enabled=$PHP_LIBXML
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension xml to build statically, but it
 depends on extension libxml, which you've configured to build shared.
 You either need to build xml shared or build libxml statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension xml to build statically, but it
-depends on extension libxml, which you've configured to build shared.
-You either need to build xml shared or build libxml statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension xml, which depends on extension libxml,
-but you've either not enabled libxml, or have disabled it.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension xml, which depends on extension libxml,
 but you've either not enabled libxml, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 
     else
-      { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5
-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "libxml2 version 2.6.11 or greater required." "$LINENO" 5
     fi
 else
-      { { echo "$as_me:$LINENO: error: xml2-config not found. Use --with-libxml-dir=<DIR>" >&5
-echo "$as_me: error: xml2-config not found. Use --with-libxml-dir=<DIR>" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "xml2-config not found. Use --with-libxml-dir=<DIR>" "$LINENO" 5
 
   fi
 
@@ -123965,9 +97428,7 @@ echo "$as_me: error: xml2-config not found. Use --with-libxml-dir=<DIR>" >&2;}
     done
 
     if test -z "$EXPAT_DIR"; then
-      { { echo "$as_me:$LINENO: error: not found. Please reinstall the expat distribution." >&5
-echo "$as_me: error: not found. Please reinstall the expat distribution." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "not found. Please reinstall the expat distribution." "$LINENO" 5
     fi
 
 
@@ -123977,10 +97438,10 @@ echo "$as_me: error: not found. Please reinstall the expat distribution." >&2;}
     ai_p=$EXPAT_DIR/include
   else
 
-    ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$EXPAT_DIR/include"`
   fi
 
 
@@ -124013,10 +97474,10 @@ echo "$as_me: error: not found. Please reinstall the expat distribution." >&2;}
     ai_p=$EXPAT_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$EXPAT_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -124056,10 +97517,10 @@ echo "$as_me: error: not found. Please reinstall the expat distribution." >&2;}
     ai_p=$EXPAT_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$EXPAT_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -124099,9 +97560,7 @@ echo "$as_me: error: not found. Please reinstall the expat distribution." >&2;}
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBEXPAT 1
-_ACEOF
+$as_echo "#define HAVE_LIBEXPAT 1" >>confdefs.h
 
   fi
 
@@ -124420,9 +97879,7 @@ EOF
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XML 1
-_ACEOF
+$as_echo "#define HAVE_XML 1" >>confdefs.h
 
 fi
 
@@ -124430,10 +97887,10 @@ fi
 
 php_enable_xmlreader=yes
 
-{ echo "$as_me:$LINENO: checking whether to enable XMLReader support" >&5
-echo $ECHO_N "checking whether to enable XMLReader support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable XMLReader support" >&5
+$as_echo_n "checking whether to enable XMLReader support... " >&6; }
 # Check whether --enable-xmlreader was given.
-if test "${enable_xmlreader+set}" = set; then
+if test "${enable_xmlreader+set}" = set; then :
   enableval=$enable_xmlreader; PHP_XMLREADER=$enableval
 else
 
@@ -124465,8 +97922,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -124475,11 +97932,11 @@ if test -z "$PHP_LIBXML_DIR"; then
 
 php_with_libxml_dir=no
 
-{ echo "$as_me:$LINENO: checking libxml2 install dir" >&5
-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml2 install dir" >&5
+$as_echo_n "checking libxml2 install dir... " >&6; }
 
 # Check whether --with-libxml-dir was given.
-if test "${with_libxml_dir+set}" = set; then
+if test "${with_libxml_dir+set}" = set; then :
   withval=$with_libxml_dir; PHP_LIBXML_DIR=$withval
 else
 
@@ -124490,8 +97947,8 @@ fi
 
 
 ext_output=$PHP_LIBXML_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -124500,16 +97957,14 @@ fi
 if test "$PHP_XMLREADER" != "no"; then
 
   if test "$PHP_LIBXML" = "no"; then
-    { { echo "$as_me:$LINENO: error: XMLReader extension requires LIBXML extension, add --enable-libxml" >&5
-echo "$as_me: error: XMLReader extension requires LIBXML extension, add --enable-libxml" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "XMLReader extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5
   fi
 
 
-{ echo "$as_me:$LINENO: checking for xml2-config path" >&5
-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6; }
-if test "${ac_cv_php_xml2_config_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5
+$as_echo_n "checking for xml2-config path... " >&6; }
+if test "${ac_cv_php_xml2_config_path+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
   for i in $PHP_LIBXML_DIR /usr/local /usr; do
@@ -124520,8 +97975,8 @@ else
   done
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5
-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_xml2_config_path" >&5
+$as_echo "$ac_cv_php_xml2_config_path" >&6; }
 
   if test -x "$ac_cv_php_xml2_config_path"; then
     XML2_CONFIG="$ac_cv_php_xml2_config_path"
@@ -124588,10 +98043,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -124635,10 +98090,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -124664,10 +98119,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
   done
 
 
-            { echo "$as_me:$LINENO: checking whether libxml build works" >&5
-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6; }
-if test "${php_cv_libxml_build_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5
+$as_echo_n "checking whether libxml build works... " >&6; }
+if test "${php_cv_libxml_build_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -124675,16 +98130,12 @@ else
   LIBS="
           $XMLREADER_SHARED_LIBADD
          $LIBS"
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
     LIBS=$old_LIBS
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -124695,26 +98146,7 @@ cat >>conftest.$ac_ext <<_ACEOF
     }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     LIBS=$old_LIBS
 
@@ -124722,43 +98154,32 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     LIBS=$old_LIBS
 
-          { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-          { { echo "$as_me:$LINENO: error: build test failed.  Please check the config.log for details." >&5
-echo "$as_me: error: build test failed.  Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          as_fn_error "build test failed.  Please check the config.log for details." "$LINENO" 5
 
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
 
-
 fi
-{ echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5
-echo "${ECHO_T}$php_cv_libxml_build_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_libxml_build_works" >&5
+$as_echo "$php_cv_libxml_build_works" >&6; }
       if test "$php_cv_libxml_build_works" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBXML 1
-_ACEOF
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
       fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XMLREADER 1
-_ACEOF
+$as_echo "#define HAVE_XMLREADER 1" >>confdefs.h
 
 
   ext_builddir=ext/xmlreader
@@ -125058,30 +98479,18 @@ EOF
   is_it_shared=$PHP_DOM_SHARED
   is_it_enabled=$PHP_DOM
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension xmlreader to build statically, but it
 depends on extension dom, which you've configured to build shared.
 You either need to build xmlreader shared or build dom statically for the
 build to be successful.
-" >&5
-echo "$as_me: error:
-You've configured extension xmlreader to build statically, but it
-depends on extension dom, which you've configured to build shared.
-You either need to build xmlreader shared or build dom statically for the
-build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension xmlreader, which depends on extension dom,
 but you've either not enabled dom, or have disabled it.
-" >&5
-echo "$as_me: error:
-You've configured extension xmlreader, which depends on extension dom,
-but you've either not enabled dom, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 
@@ -125089,14 +98498,10 @@ but you've either not enabled dom, or have disabled it.
 
 
     else
-      { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5
-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "libxml2 version 2.6.11 or greater required." "$LINENO" 5
     fi
 else
-    { { echo "$as_me:$LINENO: error: xml2-config not found. Please check your libxml2 installation." >&5
-echo "$as_me: error: xml2-config not found. Please check your libxml2 installation." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5
 
   fi
 
@@ -125119,11 +98524,11 @@ fi
 
 php_with_xmlrpc=no
 
-{ echo "$as_me:$LINENO: checking for XMLRPC-EPI support" >&5
-echo $ECHO_N "checking for XMLRPC-EPI support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XMLRPC-EPI support" >&5
+$as_echo_n "checking for XMLRPC-EPI support... " >&6; }
 
 # Check whether --with-xmlrpc was given.
-if test "${with_xmlrpc+set}" = set; then
+if test "${with_xmlrpc+set}" = set; then :
   withval=$with_xmlrpc; PHP_XMLRPC=$withval
 else
 
@@ -125155,8 +98560,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -125165,11 +98570,11 @@ if test -z "$PHP_LIBXML_DIR"; then
 
 php_with_libxml_dir=no
 
-{ echo "$as_me:$LINENO: checking libxml2 install dir" >&5
-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml2 install dir" >&5
+$as_echo_n "checking libxml2 install dir... " >&6; }
 
 # Check whether --with-libxml-dir was given.
-if test "${with_libxml_dir+set}" = set; then
+if test "${with_libxml_dir+set}" = set; then :
   withval=$with_libxml_dir; PHP_LIBXML_DIR=$withval
 else
 
@@ -125180,8 +98585,8 @@ fi
 
 
 ext_output=$PHP_LIBXML_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -125190,11 +98595,11 @@ fi
 
 php_with_libexpat_dir=no
 
-{ echo "$as_me:$LINENO: checking libexpat dir for XMLRPC-EPI" >&5
-echo $ECHO_N "checking libexpat dir for XMLRPC-EPI... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libexpat dir for XMLRPC-EPI" >&5
+$as_echo_n "checking libexpat dir for XMLRPC-EPI... " >&6; }
 
 # Check whether --with-libexpat-dir was given.
-if test "${with_libexpat_dir+set}" = set; then
+if test "${with_libexpat_dir+set}" = set; then :
   withval=$with_libexpat_dir; PHP_LIBEXPAT_DIR=$withval
 else
 
@@ -125205,8 +98610,8 @@ fi
 
 
 ext_output=$PHP_LIBEXPAT_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -125214,11 +98619,11 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_with_iconv_dir=no
 
-{ echo "$as_me:$LINENO: checking iconv dir for XMLRPC-EPI" >&5
-echo $ECHO_N "checking iconv dir for XMLRPC-EPI... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking iconv dir for XMLRPC-EPI" >&5
+$as_echo_n "checking iconv dir for XMLRPC-EPI... " >&6; }
 
 # Check whether --with-iconv-dir was given.
-if test "${with_iconv_dir+set}" = set; then
+if test "${with_iconv_dir+set}" = set; then :
   withval=$with_iconv_dir; PHP_ICONV_DIR=$withval
 else
 
@@ -125229,8 +98634,8 @@ fi
 
 
 ext_output=$PHP_ICONV_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -125242,54 +98647,38 @@ if test "$PHP_XMLRPC" != "no"; then
   is_it_shared=$PHP_LIBXML_SHARED
   is_it_enabled=$PHP_LIBXML
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension xmlrpc to build statically, but it
-depends on extension libxml, which you've configured to build shared.
-You either need to build xmlrpc shared or build libxml statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension xmlrpc to build statically, but it
 depends on extension libxml, which you've configured to build shared.
 You either need to build xmlrpc shared or build libxml statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension xmlrpc, which depends on extension libxml,
 but you've either not enabled libxml, or have disabled it.
-" >&5
-echo "$as_me: error:
-You've configured extension xmlrpc, which depends on extension libxml,
-but you've either not enabled libxml, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD"
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XMLRPC 1
-_ACEOF
+$as_echo "#define HAVE_XMLRPC 1" >>confdefs.h
 
 
         if test "$PHP_LIBEXPAT_DIR" = "no"; then
 
     if test "$PHP_LIBXML" = "no"; then
-      { { echo "$as_me:$LINENO: error: XML-RPC extension requires LIBXML extension, add --enable-libxml" >&5
-echo "$as_me: error: XML-RPC extension requires LIBXML extension, add --enable-libxml" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "XML-RPC extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5
     fi
 
 
-{ echo "$as_me:$LINENO: checking for xml2-config path" >&5
-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6; }
-if test "${ac_cv_php_xml2_config_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5
+$as_echo_n "checking for xml2-config path... " >&6; }
+if test "${ac_cv_php_xml2_config_path+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
   for i in $PHP_LIBXML_DIR /usr/local /usr; do
@@ -125300,8 +98689,8 @@ else
   done
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5
-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_xml2_config_path" >&5
+$as_echo "$ac_cv_php_xml2_config_path" >&6; }
 
   if test -x "$ac_cv_php_xml2_config_path"; then
     XML2_CONFIG="$ac_cv_php_xml2_config_path"
@@ -125368,10 +98757,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -125415,10 +98804,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -125444,10 +98833,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
   done
 
 
-            { echo "$as_me:$LINENO: checking whether libxml build works" >&5
-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6; }
-if test "${php_cv_libxml_build_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5
+$as_echo_n "checking whether libxml build works... " >&6; }
+if test "${php_cv_libxml_build_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -125455,16 +98844,12 @@ else
   LIBS="
           $XMLRPC_SHARED_LIBADD
          $LIBS"
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
     LIBS=$old_LIBS
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -125475,26 +98860,7 @@ cat >>conftest.$ac_ext <<_ACEOF
     }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     LIBS=$old_LIBS
 
@@ -125502,36 +98868,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     LIBS=$old_LIBS
 
-          { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-          { { echo "$as_me:$LINENO: error: build test failed.  Please check the config.log for details." >&5
-echo "$as_me: error: build test failed.  Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          as_fn_error "build test failed.  Please check the config.log for details." "$LINENO" 5
 
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
 
-
 fi
-{ echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5
-echo "${ECHO_T}$php_cv_libxml_build_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_libxml_build_works" >&5
+$as_echo "$php_cv_libxml_build_works" >&6; }
       if test "$php_cv_libxml_build_works" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBXML 1
-_ACEOF
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
       fi
 
@@ -125587,14 +98944,10 @@ EOF
       fi
 
     else
-      { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5
-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "libxml2 version 2.6.11 or greater required." "$LINENO" 5
     fi
 else
-      { { echo "$as_me:$LINENO: error: xml2-config not found. Use --with-libxml-dir=<DIR>" >&5
-echo "$as_me: error: xml2-config not found. Use --with-libxml-dir=<DIR>" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "xml2-config not found. Use --with-libxml-dir=<DIR>" "$LINENO" 5
 
   fi
 
@@ -125603,9 +98956,7 @@ echo "$as_me: error: xml2-config not found. Use --with-libxml-dir=<DIR>" >&2;}
     for i in $PHP_LIBEXPAT_DIR $XMLRPC_DIR /usr/local /usr; do
       if test -f $i/$PHP_LIBDIR/libexpat.a || test -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBEXPAT 1
-_ACEOF
+$as_echo "#define HAVE_LIBEXPAT 1" >>confdefs.h
 
 
 
@@ -125619,10 +98970,10 @@ _ACEOF
     ai_p=$i/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$i/$PHP_LIBDIR"`
   fi
 
 
@@ -125662,10 +99013,10 @@ _ACEOF
     ai_p=$i/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$i/$PHP_LIBDIR"`
   fi
 
 
@@ -125711,10 +99062,10 @@ _ACEOF
     ai_p=$i/include
   else
 
-    ep_dir="`echo $i/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $i/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$i/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$i/include"`
   fi
 
 
@@ -125741,9 +99092,7 @@ _ACEOF
     done
 
     if test "$testval" = "no"; then
-      { { echo "$as_me:$LINENO: error: XML-RPC support requires libexpat. Use --with-libexpat-dir=<DIR> (deprecated!)" >&5
-echo "$as_me: error: XML-RPC support requires libexpat. Use --with-libexpat-dir=<DIR> (deprecated!)" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "XML-RPC support requires libexpat. Use --with-libexpat-dir=<DIR> (deprecated!)" "$LINENO" 5
     fi
   fi
 
@@ -125778,183 +99127,21 @@ echo "$as_me: error: XML-RPC support requires libexpat. Use --with-libexpat-dir=
   if test "$PHP_ICONV" = "yes"; then
             LIBS_save="$LIBS"
     LIBS=
-    { echo "$as_me:$LINENO: checking for iconv" >&5
-echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
-if test "${ac_cv_func_iconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define iconv to an innocuous variant, in case <limits.h> declares iconv.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define iconv innocuous_iconv
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char iconv (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef iconv
-
-/* 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 iconv ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_iconv || defined __stub___iconv
-choke me
-#endif
-
-int
-main ()
-{
-return iconv ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_iconv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_iconv=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_iconv" >&5
-echo "${ECHO_T}$ac_cv_func_iconv" >&6; }
-if test $ac_cv_func_iconv = yes; then
+    ac_fn_c_check_func "$LINENO" "iconv" "ac_cv_func_iconv"
+if test "x$ac_cv_func_iconv" = x""yes; then :
 
       found_iconv=yes
 
 else
 
-      { echo "$as_me:$LINENO: checking for libiconv" >&5
-echo $ECHO_N "checking for libiconv... $ECHO_C" >&6; }
-if test "${ac_cv_func_libiconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define libiconv to an innocuous variant, in case <limits.h> declares libiconv.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define libiconv innocuous_libiconv
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char libiconv (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef libiconv
-
-/* 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 libiconv ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_libiconv || defined __stub___libiconv
-choke me
-#endif
-
-int
-main ()
-{
-return libiconv ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_libiconv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_libiconv=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_libiconv" >&5
-echo "${ECHO_T}$ac_cv_func_libiconv" >&6; }
-if test $ac_cv_func_libiconv = yes; then
+      ac_fn_c_check_func "$LINENO" "libiconv" "ac_cv_func_libiconv"
+if test "x$ac_cv_func_libiconv" = x""yes; then :
 
 
   echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBICONV 1
-_ACEOF
+$as_echo "#define HAVE_LIBICONV 1" >>confdefs.h
 
         found_iconv=yes
 
@@ -125971,9 +99158,7 @@ fi
     for i in $PHP_ICONV /usr/local /usr; do
       if test -r $i/include/giconv.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GICONV_H 1
-_ACEOF
+$as_echo "#define HAVE_GICONV_H 1" >>confdefs.h
 
         ICONV_DIR=$i
         iconv_lib_name=giconv
@@ -125986,9 +99171,7 @@ _ACEOF
     done
 
     if test -z "$ICONV_DIR"; then
-      { { echo "$as_me:$LINENO: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" >&5
-echo "$as_me: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Please specify the install prefix of iconv with --with-iconv=<DIR>" "$LINENO" 5
     fi
 
     if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a ||
@@ -126056,10 +99239,10 @@ echo "$as_me: error: Please specify the install prefix of iconv with --with-icon
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -126091,19 +99274,15 @@ echo "$as_me: error: Please specify the install prefix of iconv with --with-icon
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$iconv_lib_name''_libiconv" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for libiconv in -l$iconv_lib_name" >&5
-echo $ECHO_N "checking for libiconv in -l$iconv_lib_name... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$iconv_lib_name''_libiconv" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv in -l$iconv_lib_name" >&5
+$as_echo_n "checking for libiconv in -l$iconv_lib_name... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$iconv_lib_name  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -126121,40 +99300,20 @@ return libiconv ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -126164,17 +99323,13 @@ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBICONV 1
-_ACEOF
+$as_echo "#define HAVE_LIBICONV 1" >>confdefs.h
 
 
   echo "#define ICONV_ALIASED_LIBICONV 1" > ext/iconv/php_iconv_aliased_libiconv.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define ICONV_ALIASED_LIBICONV 1
-_ACEOF
+$as_echo "#define ICONV_ALIASED_LIBICONV 1" >>confdefs.h
 
 
 
@@ -126246,10 +99401,10 @@ else
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -126281,19 +99436,15 @@ else
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$iconv_lib_name''_iconv" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for iconv in -l$iconv_lib_name" >&5
-echo $ECHO_N "checking for iconv in -l$iconv_lib_name... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$iconv_lib_name''_iconv" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv in -l$iconv_lib_name" >&5
+$as_echo_n "checking for iconv in -l$iconv_lib_name... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$iconv_lib_name  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -126311,40 +99462,20 @@ return iconv ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -126373,9 +99504,7 @@ fi
   echo "#define HAVE_ICONV 1" > ext/iconv/php_have_iconv.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ICONV 1
-_ACEOF
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
 
     if test -n "$ICONV_DIR"; then
 
@@ -126390,10 +99519,10 @@ _ACEOF
     ai_p=$ICONV_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ICONV_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -126433,10 +99562,10 @@ _ACEOF
     ai_p=$ICONV_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ICONV_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -126482,10 +99611,10 @@ _ACEOF
     ai_p=$ICONV_DIR/include
   else
 
-    ep_dir="`echo $ICONV_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ICONV_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ICONV_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ICONV_DIR/include"`
   fi
 
 
@@ -126509,9 +99638,7 @@ _ACEOF
     fi
 
 else
-      { { echo "$as_me:$LINENO: error: iconv not found, in order to build xmlrpc you need the iconv library" >&5
-echo "$as_me: error: iconv not found, in order to build xmlrpc you need the iconv library" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "iconv not found, in order to build xmlrpc you need the iconv library" "$LINENO" 5
 
   fi
 
@@ -126522,10 +99649,10 @@ if test "$PHP_XMLRPC" = "yes"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -126535,25 +99662,25 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -126562,10 +99689,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -126575,25 +99702,25 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -126601,12 +99728,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -126615,18 +99738,14 @@ else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-{ echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
-if test "${ac_cv_c_inline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if test "${ac_cv_c_inline+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __cplusplus
 typedef int foo_t;
@@ -126635,39 +99754,16 @@ $ac_kw foo_t foo () {return 0; }
 #endif
 
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_inline=$ac_kw
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   test "$ac_cv_c_inline" != no && break
 done
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
 
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -126691,22 +99787,16 @@ esac
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define UNDEF_THREADS_HACK
-_ACEOF
+$as_echo "#define UNDEF_THREADS_HACK /**/" >>confdefs.h
 
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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 test "${ac_cv_header_stdc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -126721,85 +99811,53 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
+  ac_cv_header_stdc=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
-rm -f -r conftest*
+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 >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -126826,189 +99884,33 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&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
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
-
-
-
-
-
 for ac_header in xmlparse.h xmltok.h stdlib.h strings.h string.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+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"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -127020,403 +99922,32 @@ done
 
 
 
-{ echo "$as_me:$LINENO: checking for char" >&5
-echo $ECHO_N "checking for char... $ECHO_C" >&6; }
-if test "${ac_cv_type_char+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef char ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_char=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_char=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
-echo "${ECHO_T}$ac_cv_type_char" >&6; }
-
 # 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.
-{ echo "$as_me:$LINENO: checking size of char" >&5
-echo $ECHO_N "checking size of char... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_char+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef char ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef char ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5
+$as_echo_n "checking size of char... " >&6; }
+if test "${ac_cv_sizeof_char+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef char ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef char ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char"        "$ac_includes_default"; then :
 
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef char ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_char=$ac_lo;;
-'') if test "$ac_cv_type_char" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_char=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef char ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_char=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_char" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (char)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_char" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (char)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_char=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
-echo "${ECHO_T}$ac_cv_sizeof_char" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_char" >&5
+$as_echo "$ac_cv_sizeof_char" >&6; }
 
 
 
@@ -127426,403 +99957,32 @@ _ACEOF
 
 
 
-{ echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6; }
-if test "${ac_cv_type_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef int ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_int=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6; }
-
 # 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.
-{ echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
+if test "${ac_cv_sizeof_int+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_int=$ac_lo;;
-'') if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_int=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef int ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_int" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (int)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_int=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$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; }
 
 
 
@@ -127831,403 +99991,32 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6; }
-
 # 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.
-{ echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if test "${ac_cv_sizeof_long+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
 
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long=$ac_lo;;
-'') if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long=`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_long=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$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; }
 
 
 
@@ -128236,403 +100025,32 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
-if test "${ac_cv_type_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef long long ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_long_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_long_long=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
-
 # 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.
-{ echo "$as_me:$LINENO: checking size of long long" >&5
-echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
-if test "${ac_cv_sizeof_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+$as_echo_n "checking size of long long... " >&6; }
+if test "${ac_cv_sizeof_long_long+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-test_array [0] = 0
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
 
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr $ac_mid + 1`
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_hi=`expr '(' $ac_mid ')' - 1`
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			ac_mid=`expr 2 '*' $ac_mid`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo= ac_hi=
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-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
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_long=$ac_lo;;
-'') if test "$ac_cv_type_long_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-   else
-     ac_cv_sizeof_long_long=0
-   fi ;;
-esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-   typedef long long ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-    {
-      long int i = longval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-	return 1;
-      fprintf (f, "%lu\n", i);
-    }
-  return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-if test "$ac_cv_type_long_long" = yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long)
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+  if test "$ac_cv_type_long_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "cannot compute sizeof (long long)
+See \`config.log' for more details." "$LINENO" 5; }; }
    else
      ac_cv_sizeof_long_long=0
    fi
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.val
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-echo "${ECHO_T}$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; }
 
 
 
@@ -128641,61 +100059,9 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef size_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_size_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_size_t=no
-fi
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = x""yes; then :
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-if test $ac_cv_type_size_t = yes; then
-  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -128704,16 +100070,12 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
-if test "${ac_cv_header_time+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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 test "${ac_cv_header_time+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/time.h>
@@ -128728,78 +100090,48 @@ return 0;
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_time=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_time=no
+  ac_cv_header_time=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6; }
+{ $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
 
-cat >>confdefs.h <<\_ACEOF
-#define TIME_WITH_SYS_TIME 1
-_ACEOF
+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
-if test "${ac_cv_type_uid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $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 test "${ac_cv_type_uid_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 
 _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
   ac_cv_type_uid_t=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-echo "${ECHO_T}$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
 
-cat >>confdefs.h <<\_ACEOF
-#define uid_t int
-_ACEOF
+$as_echo "#define uid_t int" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define gid_t int
-_ACEOF
+$as_echo "#define gid_t int" >>confdefs.h
 
 fi
 
@@ -128809,105 +100141,17 @@ fi
 
 
 # Standard XMLRPC list
-
-
-
-
-
-
-
-
 for ac_func in \
  strtoul strtoull snprintf \
  strstr strpbrk strerror\
  memcpy memmove
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+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"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -129243,24 +100487,22 @@ elif test "$PHP_XMLRPC" != "no"; then
   elif test -r $PHP_XMLRPC/include/xmlrpc-epi/xmlrpc.h; then
     XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi
   else
-    { echo "$as_me:$LINENO: checking for XMLRPC-EPI in default path" >&5
-echo $ECHO_N "checking for XMLRPC-EPI in default path... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XMLRPC-EPI in default path" >&5
+$as_echo_n "checking for XMLRPC-EPI in default path... " >&6; }
     for i in /usr/local /usr; do
       if test -r $i/include/xmlrpc.h; then
         XMLRPC_DIR=$i/include
-        { echo "$as_me:$LINENO: result: found in $i" >&5
-echo "${ECHO_T}found in $i" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $i" >&5
+$as_echo "found in $i" >&6; }
         break
       fi
     done
   fi
 
   if test -z "$XMLRPC_DIR"; then
-    { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-    { { echo "$as_me:$LINENO: error: Please reinstall the XMLRPC-EPI distribution" >&5
-echo "$as_me: error: Please reinstall the XMLRPC-EPI distribution" >&2;}
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+    as_fn_error "Please reinstall the XMLRPC-EPI distribution" "$LINENO" 5
   fi
 
 
@@ -129270,10 +100512,10 @@ echo "$as_me: error: Please reinstall the XMLRPC-EPI distribution" >&2;}
     ai_p=$XMLRPC_DIR
   else
 
-    ep_dir="`echo $XMLRPC_DIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $XMLRPC_DIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$XMLRPC_DIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$XMLRPC_DIR"`
   fi
 
 
@@ -129306,10 +100548,10 @@ echo "$as_me: error: Please reinstall the XMLRPC-EPI distribution" >&2;}
     ai_p=$XMLRPC_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$XMLRPC_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -129349,10 +100591,10 @@ echo "$as_me: error: Please reinstall the XMLRPC-EPI distribution" >&2;}
     ai_p=$XMLRPC_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$XMLRPC_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -129691,10 +100933,10 @@ fi
 
 php_enable_xmlwriter=yes
 
-{ echo "$as_me:$LINENO: checking whether to enable XMLWriter support" >&5
-echo $ECHO_N "checking whether to enable XMLWriter support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable XMLWriter support" >&5
+$as_echo_n "checking whether to enable XMLWriter support... " >&6; }
 # Check whether --enable-xmlwriter was given.
-if test "${enable_xmlwriter+set}" = set; then
+if test "${enable_xmlwriter+set}" = set; then :
   enableval=$enable_xmlwriter; PHP_XMLWRITER=$enableval
 else
 
@@ -129726,8 +100968,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -129736,11 +100978,11 @@ if test -z "$PHP_LIBXML_DIR"; then
 
 php_with_libxml_dir=no
 
-{ echo "$as_me:$LINENO: checking libxml2 install dir" >&5
-echo $ECHO_N "checking libxml2 install dir... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libxml2 install dir" >&5
+$as_echo_n "checking libxml2 install dir... " >&6; }
 
 # Check whether --with-libxml-dir was given.
-if test "${with_libxml_dir+set}" = set; then
+if test "${with_libxml_dir+set}" = set; then :
   withval=$with_libxml_dir; PHP_LIBXML_DIR=$withval
 else
 
@@ -129751,8 +100993,8 @@ fi
 
 
 ext_output=$PHP_LIBXML_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -129761,16 +101003,14 @@ fi
 if test "$PHP_XMLWRITER" != "no"; then
 
   if test "$PHP_LIBXML" = "no"; then
-    { { echo "$as_me:$LINENO: error: XMLWriter extension requires LIBXML extension, add --enable-libxml" >&5
-echo "$as_me: error: XMLWriter extension requires LIBXML extension, add --enable-libxml" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "XMLWriter extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5
   fi
 
 
-{ echo "$as_me:$LINENO: checking for xml2-config path" >&5
-echo $ECHO_N "checking for xml2-config path... $ECHO_C" >&6; }
-if test "${ac_cv_php_xml2_config_path+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml2-config path" >&5
+$as_echo_n "checking for xml2-config path... " >&6; }
+if test "${ac_cv_php_xml2_config_path+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
   for i in $PHP_LIBXML_DIR /usr/local /usr; do
@@ -129781,8 +101021,8 @@ else
   done
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_php_xml2_config_path" >&5
-echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_php_xml2_config_path" >&5
+$as_echo "$ac_cv_php_xml2_config_path" >&6; }
 
   if test -x "$ac_cv_php_xml2_config_path"; then
     XML2_CONFIG="$ac_cv_php_xml2_config_path"
@@ -129849,10 +101089,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -129896,10 +101136,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -129925,10 +101165,10 @@ echo "${ECHO_T}$ac_cv_php_xml2_config_path" >&6; }
   done
 
 
-            { echo "$as_me:$LINENO: checking whether libxml build works" >&5
-echo $ECHO_N "checking whether libxml build works... $ECHO_C" >&6; }
-if test "${php_cv_libxml_build_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libxml build works" >&5
+$as_echo_n "checking whether libxml build works... " >&6; }
+if test "${php_cv_libxml_build_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -129936,16 +101176,12 @@ else
   LIBS="
           $XMLWRITER_SHARED_LIBADD
          $LIBS"
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
 
     LIBS=$old_LIBS
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -129956,26 +101192,7 @@ cat >>conftest.$ac_ext <<_ACEOF
     }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     LIBS=$old_LIBS
 
@@ -129983,43 +101200,32 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     LIBS=$old_LIBS
 
-          { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-          { { echo "$as_me:$LINENO: error: build test failed.  Please check the config.log for details." >&5
-echo "$as_me: error: build test failed.  Please check the config.log for details." >&2;}
-   { (exit 1); exit 1; }; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+          as_fn_error "build test failed.  Please check the config.log for details." "$LINENO" 5
 
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
 
-
 fi
-{ echo "$as_me:$LINENO: result: $php_cv_libxml_build_works" >&5
-echo "${ECHO_T}$php_cv_libxml_build_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_libxml_build_works" >&5
+$as_echo "$php_cv_libxml_build_works" >&6; }
       if test "$php_cv_libxml_build_works" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBXML 1
-_ACEOF
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
       fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XMLWRITER 1
-_ACEOF
+$as_echo "#define HAVE_XMLWRITER 1" >>confdefs.h
 
 
   ext_builddir=ext/xmlwriter
@@ -130319,14 +101525,10 @@ EOF
 
 
     else
-      { { echo "$as_me:$LINENO: error: libxml2 version 2.6.11 or greater required." >&5
-echo "$as_me: error: libxml2 version 2.6.11 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "libxml2 version 2.6.11 or greater required." "$LINENO" 5
     fi
 else
-    { { echo "$as_me:$LINENO: error: xml2-config not found. Please check your libxml2 installation." >&5
-echo "$as_me: error: xml2-config not found. Please check your libxml2 installation." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "xml2-config not found. Please check your libxml2 installation." "$LINENO" 5
 
   fi
 
@@ -130336,11 +101538,11 @@ fi
 
 php_with_xsl=no
 
-{ echo "$as_me:$LINENO: checking for XSL support" >&5
-echo $ECHO_N "checking for XSL support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XSL support" >&5
+$as_echo_n "checking for XSL support... " >&6; }
 
 # Check whether --with-xsl was given.
-if test "${with_xsl+set}" = set; then
+if test "${with_xsl+set}" = set; then :
   withval=$with_xsl; PHP_XSL=$withval
 else
 
@@ -130372,8 +101574,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -130381,15 +101583,11 @@ echo "${ECHO_T}$ext_output" >&6; }
 if test "$PHP_XSL" != "no"; then
 
   if test "$PHP_LIBXML" = "no"; then
-    { { echo "$as_me:$LINENO: error: XSL extension requires LIBXML extension, add --enable-libxml" >&5
-echo "$as_me: error: XSL extension requires LIBXML extension, add --enable-libxml" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "XSL extension requires LIBXML extension, add --enable-libxml" "$LINENO" 5
   fi
 
   if test "$PHP_DOM" = "no"; then
-    { { echo "$as_me:$LINENO: error: XSL extension requires DOM extension, add --enable-dom" >&5
-echo "$as_me: error: XSL extension requires DOM extension, add --enable-dom" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "XSL extension requires DOM extension, add --enable-dom" "$LINENO" 5
   fi
 
   for i in $PHP_XSL /usr/local /usr; do
@@ -130400,9 +101598,7 @@ echo "$as_me: error: XSL extension requires DOM extension, add --enable-dom" >&2
   done
 
   if test -z "$XSLT_CONFIG"; then
-    { { echo "$as_me:$LINENO: error: xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" >&5
-echo "$as_me: error: xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" "$LINENO" 5
   else
     libxslt_full_version=`$XSLT_CONFIG --version`
     ac_IFS=$IFS
@@ -130467,10 +101663,10 @@ echo "$as_me: error: xslt-config not found. Please reinstall the libxslt >= 1.1.
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -130514,10 +101710,10 @@ echo "$as_me: error: xslt-config not found. Please reinstall the libxslt >= 1.1.
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -130543,8 +101739,8 @@ echo "$as_me: error: xslt-config not found. Please reinstall the libxslt >= 1.1.
   done
 
 
-      { echo "$as_me:$LINENO: checking for EXSLT support" >&5
-echo $ECHO_N "checking for EXSLT support... $ECHO_C" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXSLT support" >&5
+$as_echo_n "checking for EXSLT support... " >&6; }
       for i in $PHP_XSL /usr/local /usr; do
         if test -r "$i/include/libexslt/exslt.h"; then
           PHP_XSL_EXSL_DIR=$i
@@ -130552,11 +101748,11 @@ echo $ECHO_N "checking for EXSLT support... $ECHO_C" >&6; }
         fi
       done
       if test -z "$PHP_XSL_EXSL_DIR"; then
-        { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
       else
-        { echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
 
 
   if test "$ext_shared" = "yes"; then
@@ -130569,10 +101765,10 @@ echo "${ECHO_T}found" >&6; }
     ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -130612,10 +101808,10 @@ echo "${ECHO_T}found" >&6; }
     ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -130661,10 +101857,10 @@ echo "${ECHO_T}found" >&6; }
     ai_p=$PHP_XSL_EXSL_DIR/include
   else
 
-    ep_dir="`echo $PHP_XSL_EXSL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_XSL_EXSL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/include\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_XSL_EXSL_DIR/include"`
   fi
 
 
@@ -130686,24 +101882,18 @@ echo "${ECHO_T}found" >&6; }
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XSL_EXSLT 1
-_ACEOF
+$as_echo "#define HAVE_XSL_EXSLT 1" >>confdefs.h
 
       fi
     else
-      { { echo "$as_me:$LINENO: error: libxslt version 1.1.0 or greater required." >&5
-echo "$as_me: error: libxslt version 1.1.0 or greater required." >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "libxslt version 1.1.0 or greater required." "$LINENO" 5
     fi
 
 
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XSL 1
-_ACEOF
+$as_echo "#define HAVE_XSL 1" >>confdefs.h
 
 
   ext_builddir=ext/xsl
@@ -131006,30 +102196,18 @@ EOF
   is_it_shared=$PHP_LIBXML_SHARED
   is_it_enabled=$PHP_LIBXML
   if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    { { echo "$as_me:$LINENO: error:
-You've configured extension xsl to build statically, but it
-depends on extension libxml, which you've configured to build shared.
-You either need to build xsl shared or build libxml statically for the
-build to be successful.
-" >&5
-echo "$as_me: error:
+    as_fn_error "
 You've configured extension xsl to build statically, but it
 depends on extension libxml, which you've configured to build shared.
 You either need to build xsl shared or build libxml statically for the
 build to be successful.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
   if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then
-    { { echo "$as_me:$LINENO: error:
+    as_fn_error "
 You've configured extension xsl, which depends on extension libxml,
 but you've either not enabled libxml, or have disabled it.
-" >&5
-echo "$as_me: error:
-You've configured extension xsl, which depends on extension libxml,
-but you've either not enabled libxml, or have disabled it.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
   fi
 
 fi
@@ -131038,10 +102216,10 @@ fi
 
 php_enable_zip=no
 
-{ echo "$as_me:$LINENO: checking for zip archive read/writesupport" >&5
-echo $ECHO_N "checking for zip archive read/writesupport... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip archive read/writesupport" >&5
+$as_echo_n "checking for zip archive read/writesupport... " >&6; }
 # Check whether --enable-zip was given.
-if test "${enable_zip+set}" = set; then
+if test "${enable_zip+set}" = set; then :
   enableval=$enable_zip; PHP_ZIP=$enableval
 else
 
@@ -131073,8 +102251,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -131083,11 +102261,11 @@ if test -z "$PHP_ZLIB_DIR"; then
 
 php_with_zlib_dir=no
 
-{ echo "$as_me:$LINENO: checking for the location of libz" >&5
-echo $ECHO_N "checking for the location of libz... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libz" >&5
+$as_echo_n "checking for the location of libz... " >&6; }
 
 # Check whether --with-zlib-dir was given.
-if test "${with_zlib_dir+set}" = set; then
+if test "${with_zlib_dir+set}" = set; then :
   withval=$with_zlib_dir; PHP_ZLIB_DIR=$withval
 else
 
@@ -131098,8 +102276,8 @@ fi
 
 
 ext_output=$PHP_ZLIB_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -131108,11 +102286,11 @@ fi
 
 php_with_pcre_dir=no
 
-{ echo "$as_me:$LINENO: checking pcre install prefix" >&5
-echo $ECHO_N "checking pcre install prefix... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pcre install prefix" >&5
+$as_echo_n "checking pcre install prefix... " >&6; }
 
 # Check whether --with-pcre-dir was given.
-if test "${with_pcre_dir+set}" = set; then
+if test "${with_pcre_dir+set}" = set; then :
   withval=$with_pcre_dir; PHP_PCRE_DIR=$withval
 else
 
@@ -131123,8 +102301,8 @@ fi
 
 
 ext_output=$PHP_PCRE_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -131139,9 +102317,7 @@ if test "$PHP_ZIP" != "no"; then
       PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
       PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
     else
-      { { echo "$as_me:$LINENO: error: Can not find zlib headers under \"$PHP_ZLIB_DIR\"" >&5
-echo "$as_me: error: Can not find zlib headers under \"$PHP_ZLIB_DIR\"" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "Can not find zlib headers under \"$PHP_ZLIB_DIR\"" "$LINENO" 5
     fi
   else
     for i in /usr/local /usr; do
@@ -131155,15 +102331,13 @@ echo "$as_me: error: Can not find zlib headers under \"$PHP_ZLIB_DIR\"" >&2;}
     done
   fi
 
-    { echo "$as_me:$LINENO: checking for the location of zlib" >&5
-echo $ECHO_N "checking for the location of zlib... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of zlib" >&5
+$as_echo_n "checking for the location of zlib... " >&6; }
   if test "$PHP_ZLIB_DIR" = "no"; then
-    { { echo "$as_me:$LINENO: error: zip support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located" >&5
-echo "$as_me: error: zip support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "zip support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located" "$LINENO" 5
   else
-    { echo "$as_me:$LINENO: result: $PHP_ZLIB_DIR" >&5
-echo "${ECHO_T}$PHP_ZLIB_DIR" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_ZLIB_DIR" >&5
+$as_echo "$PHP_ZLIB_DIR" >&6; }
 
 
   if test "$ext_shared" = "yes"; then
@@ -131176,10 +102350,10 @@ echo "${ECHO_T}$PHP_ZLIB_DIR" >&6; }
     ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_ZLIB_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -131219,10 +102393,10 @@ echo "${ECHO_T}$PHP_ZLIB_DIR" >&6; }
     ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR
   else
 
-    ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_ZLIB_DIR/$PHP_LIBDIR"`
   fi
 
 
@@ -131268,10 +102442,10 @@ echo "${ECHO_T}$PHP_ZLIB_DIR" >&6; }
     ai_p=$PHP_ZLIB_INCDIR
   else
 
-    ep_dir="`echo $PHP_ZLIB_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $PHP_ZLIB_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_ZLIB_INCDIR\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$PHP_ZLIB_INCDIR"`
   fi
 
 
@@ -131296,11 +102470,7 @@ echo "${ECHO_T}$PHP_ZLIB_DIR" >&6; }
 
     old_CPPFLAGS=$CPPFLAGS
   CPPFLAGS=$INCLUDES
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <main/php_config.h>
@@ -131310,17 +102480,13 @@ 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 :
 
     PHP_PCRE_REGEX=yes
 
 else
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <main/php_config.h>
@@ -131330,7 +102496,7 @@ 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 :
 
       PHP_PCRE_REGEX=pecl
 
@@ -131339,11 +102505,11 @@ else
       PHP_PCRE_REGEX=no
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
   CPPFLAGS=$old_CPPFLAGS
 
@@ -131375,9 +102541,7 @@ rm -f -r conftest*
 						 lib/zip_source_read.c lib/zip_source_stat.c"
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ZIP 1
-_ACEOF
+$as_echo "#define HAVE_ZIP 1" >>confdefs.h
 
 
   ext_builddir=ext/zip
@@ -131693,10 +102857,10 @@ fi
 
 php_enable_mysqlnd=no
 
-{ echo "$as_me:$LINENO: checking whether to enable mysqlnd" >&5
-echo $ECHO_N "checking whether to enable mysqlnd... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mysqlnd" >&5
+$as_echo_n "checking whether to enable mysqlnd... " >&6; }
 # Check whether --enable-mysqlnd was given.
-if test "${enable_mysqlnd+set}" = set; then
+if test "${enable_mysqlnd+set}" = set; then :
   enableval=$enable_mysqlnd; PHP_MYSQLND=$enableval
 else
 
@@ -131728,8 +102892,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -131737,10 +102901,10 @@ echo "${ECHO_T}$ext_output" >&6; }
 
 php_enable_mysqlnd_compression_support=yes
 
-{ echo "$as_me:$LINENO: checking whether to disable compressed protocol support in mysqlnd" >&5
-echo $ECHO_N "checking whether to disable compressed protocol support in mysqlnd... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable compressed protocol support in mysqlnd" >&5
+$as_echo_n "checking whether to disable compressed protocol support in mysqlnd... " >&6; }
 # Check whether --enable-mysqlnd_compression_support was given.
-if test "${enable_mysqlnd_compression_support+set}" = set; then
+if test "${enable_mysqlnd_compression_support+set}" = set; then :
   enableval=$enable_mysqlnd_compression_support; PHP_MYSQLND_COMPRESSION_SUPPORT=$enableval
 else
 
@@ -131751,8 +102915,8 @@ fi
 
 
 ext_output=$PHP_MYSQLND_COMPRESSION_SUPPORT
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -131761,11 +102925,11 @@ if test -z "$PHP_ZLIB_DIR"; then
 
 php_with_zlib_dir=no
 
-{ echo "$as_me:$LINENO: checking for the location of libz" >&5
-echo $ECHO_N "checking for the location of libz... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libz" >&5
+$as_echo_n "checking for the location of libz... " >&6; }
 
 # Check whether --with-zlib-dir was given.
-if test "${with_zlib_dir+set}" = set; then
+if test "${with_zlib_dir+set}" = set; then :
   withval=$with_zlib_dir; PHP_ZLIB_DIR=$withval
 else
 
@@ -131776,8 +102940,8 @@ fi
 
 
 ext_output=$PHP_ZLIB_DIR
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -131794,15 +102958,11 @@ if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
 
   if test "$PHP_MYSQLND_COMPRESSION_SUPPORT" != "no"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define MYSQLND_COMPRESSION_WANTED 1
-_ACEOF
+$as_echo "#define MYSQLND_COMPRESSION_WANTED 1" >>confdefs.h
 
   fi
 
-cat >>confdefs.h <<\_ACEOF
-#define MYSQLND_SSL_SUPPORTED 1
-_ACEOF
+$as_echo "#define MYSQLND_SSL_SUPPORTED 1" >>confdefs.h
 
 
   mysqlnd_sources="$mysqlnd_base_sources $mysqlnd_ps_sources"
@@ -132133,28 +103293,24 @@ if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes" || test "$
 
 
   for php_typename in int8 uint8 int16 uint16 int32 uint32 uchar ulong int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t; do
-    { echo "$as_me:$LINENO: checking whether $php_typename exists" >&5
-echo $ECHO_N "checking whether $php_typename exists... $ECHO_C" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $php_typename exists" >&5
+$as_echo_n "checking whether $php_typename exists... " >&6; }
 
   php_cache_value=php_cv_sizeof_$php_typename
-  if { as_var=php_cv_sizeof_$php_typename; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if { as_var=php_cv_sizeof_$php_typename; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
 
     old_LIBS=$LIBS
     LIBS=
     old_LDFLAGS=$LDFLAGS
     LDFLAGS=
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
 
     eval $php_cache_value=0
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 #if STDC_HEADERS
@@ -132184,43 +103340,19 @@ int main()
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
     eval $php_cache_value=`cat conftestval`
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
     eval $php_cache_value=0
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
 
@@ -132233,12 +103365,12 @@ fi
   echo "#define $php_def_have_what 1" >> ext/mysqlnd/php_mysqlnd_config.h
 
 
-      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-      { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
   fi
 
@@ -132311,10 +103443,10 @@ if test "$PHP_RECODE" != "no"; then
     ai_p=$ac_ii
   else
 
-    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
+    ep_dir=`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`
 
-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
+    ep_realdir=`(cd "$ep_dir" && pwd)`
+    ai_p="$ep_realdir"/`basename "$ac_ii"`
   fi
 
 
@@ -132346,19 +103478,15 @@ if test "$PHP_RECODE" != "no"; then
     esac
   done
 
-  as_ac_Lib=`echo "ac_cv_lib_$MYSQL_LIBNAME''_hash_insert" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for hash_insert in -l$MYSQL_LIBNAME" >&5
-echo $ECHO_N "checking for hash_insert in -l$MYSQL_LIBNAME... $ECHO_C" >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Lib=`$as_echo "ac_cv_lib_$MYSQL_LIBNAME''_hash_insert" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hash_insert in -l$MYSQL_LIBNAME" >&5
+$as_echo_n "checking for hash_insert in -l$MYSQL_LIBNAME... " >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$MYSQL_LIBNAME  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -132376,40 +103504,20 @@ return hash_insert ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Lib=no"
+  eval "$as_ac_Lib=no"
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-ac_res=`eval echo '${'$as_ac_Lib'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+eval ac_res=\$$as_ac_Lib
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Lib
+   if test "x$as_val" = x""yes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -132429,9 +103537,7 @@ fi
   fi
 
   if test -n "$recode_conflict"; then
-    { { echo "$as_me:$LINENO: error: recode extension can not be configured together with:$recode_conflict" >&5
-echo "$as_me: error: recode extension can not be configured together with:$recode_conflict" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "recode extension can not be configured together with:$recode_conflict" "$LINENO" 5
   fi
 fi
 
@@ -132473,16 +103579,16 @@ unset LIBS LDFLAGS
 
 
 # Check whether --enable- was given.
-if test "${enable_+set}" = set; then
+if test "${enable_+set}" = set; then :
   enableval=$enable_;
 fi
 
 
 
-  { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-  { echo "$as_me:$LINENO: result: ${T_MD}Configuring PEAR${T_ME}" >&5
-echo "${ECHO_T}${T_MD}Configuring PEAR${T_ME}" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring PEAR${T_ME}" >&5
+$as_echo "${T_MD}Configuring PEAR${T_ME}" >&6; }
 
 
 # compatibility
@@ -132498,11 +103604,11 @@ fi
 
 php_with_pear=DEFAULT
 
-{ echo "$as_me:$LINENO: checking whether to install PEAR" >&5
-echo $ECHO_N "checking whether to install PEAR... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to install PEAR" >&5
+$as_echo_n "checking whether to install PEAR... " >&6; }
 
 # Check whether --with-pear was given.
-if test "${with_pear+set}" = set; then
+if test "${with_pear+set}" = set; then :
   withval=$with_pear; PHP_PEAR=$withval
 else
 
@@ -132534,8 +103640,8 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: result: $ext_output" >&5
-echo "${ECHO_T}$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -132549,9 +103655,7 @@ if test "$PHP_PEAR" != "no"; then
 
 
   if test "$pear_error_msg"; then
-    { { echo "$as_me:$LINENO: error: $pear_error_msg" >&5
-echo "$as_me: error: $pear_error_msg" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "$pear_error_msg" "$LINENO" 5
   fi
 
   install_pear="install-pear"
@@ -132576,16 +103680,16 @@ fi
 
 
 # Check whether --enable- was given.
-if test "${enable_+set}" = set; then
+if test "${enable_+set}" = set; then :
   enableval=$enable_;
 fi
 
 
 
-  { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-  { echo "$as_me:$LINENO: result: ${T_MD}Configuring Zend${T_ME}" >&5
-echo "${ECHO_T}${T_MD}Configuring Zend${T_ME}" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring Zend${T_ME}" >&5
+$as_echo "${T_MD}Configuring Zend${T_ME}" >&6; }
 
 
 
@@ -132597,17 +103701,17 @@ echo "${ECHO_T}${T_MD}Configuring Zend${T_ME}" >&6; }
 
 
   # we only support certain bison versions
-  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2"
+  bison_version_list="1.28 1.35 1.75 1.875 2.0 2.1 2.2 2.3 2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2 2.6.4"
 
   # for standalone build of Zend Engine
   test -z "$SED" && SED=sed
 
   bison_version=none
   if test "$YACC"; then
-    { echo "$as_me:$LINENO: checking for bison version" >&5
-echo $ECHO_N "checking for bison version... $ECHO_C" >&6; }
-if test "${php_cv_bison_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bison version" >&5
+$as_echo_n "checking for bison version... " >&6; }
+if test "${php_cv_bison_version+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
       bison_version_vars=`bison --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | $SED -e 's/\./ /' | tr -d a-z`
@@ -132624,14 +103728,14 @@ else
       fi
 
 fi
-{ echo "$as_me:$LINENO: result: $php_cv_bison_version" >&5
-echo "${ECHO_T}$php_cv_bison_version" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_bison_version" >&5
+$as_echo "$php_cv_bison_version" >&6; }
   fi
   case $php_cv_bison_version in
     ""|invalid)
       bison_msg="bison versions supported for regeneration of the Zend/PHP parsers: $bison_version_list (found: $bison_version)."
-      { echo "$as_me:$LINENO: WARNING: $bison_msg" >&5
-echo "$as_me: WARNING: $bison_msg" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $bison_msg" >&5
+$as_echo "$as_me: WARNING: $bison_msg" >&2;}
       YACC="exit 0;"
       ;;
   esac
@@ -132646,19 +103750,6 @@ if test "$ac_cv_c_compiler_gnu" = "yes" -a "`uname -s`" = "Rhapsody"; then
         CPPFLAGS="$CPPFLAGS -traditional-cpp"
 fi
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 for ac_header in inttypes.h \
 stdint.h \
 limits.h \
@@ -132672,138 +103763,13 @@ signal.h \
 unix.h \
 stdlib.h \
 dlfcn.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+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"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -132811,61 +103777,9 @@ fi
 done
 
 
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef size_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_size_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_size_t=no
-fi
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = x""yes; then :
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-if test $ac_cv_type_size_t = yes; then
-  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -132874,16 +103788,12 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
-if test "${ac_cv_type_signal+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
+$as_echo_n "checking return type of signal handlers... " >&6; }
+if test "${ac_cv_type_signal+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <signal.h>
@@ -132896,35 +103806,15 @@ return *(signal (0, 0)) (0) == 1;
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_type_signal=int
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_signal=void
+  ac_cv_type_signal=void
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
+$as_echo "$ac_cv_type_signal" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define RETSIGTYPE $ac_cv_type_signal
@@ -132936,61 +103826,9 @@ _ACEOF
 
 
 
-{ echo "$as_me:$LINENO: checking for uint" >&5
-echo $ECHO_N "checking for uint... $ECHO_C" >&6; }
-if test "${ac_cv_type_uint+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef uint ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_uint=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_type "$LINENO" "uint" "ac_cv_type_uint" "$ac_includes_default"
+if test "x$ac_cv_type_uint" = x""yes; then :
 
-	ac_cv_type_uint=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_uint" >&5
-echo "${ECHO_T}$ac_cv_type_uint" >&6; }
-if test $ac_cv_type_uint = yes; then
-  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -132999,61 +103837,9 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for ulong" >&5
-echo $ECHO_N "checking for ulong... $ECHO_C" >&6; }
-if test "${ac_cv_type_ulong+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef ulong ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_ulong=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_ulong=no
-fi
+ac_fn_c_check_type "$LINENO" "ulong" "ac_cv_type_ulong" "$ac_includes_default"
+if test "x$ac_cv_type_ulong" = x""yes; then :
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_ulong" >&5
-echo "${ECHO_T}$ac_cv_type_ulong" >&6; }
-if test $ac_cv_type_ulong = yes; then
-  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -133064,13 +103850,9 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking for int32_t" >&5
-echo $ECHO_N "checking for int32_t... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for int32_t" >&5
+$as_echo_n "checking for int32_t... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #if HAVE_SYS_TYPES_H
@@ -133093,50 +103875,26 @@ if (sizeof (int32_t))
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_INT32_T 1
 _ACEOF
 
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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.$ac_ext
 
-{ echo "$as_me:$LINENO: checking for uint32_t" >&5
-echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint32_t" >&5
+$as_echo_n "checking for uint32_t... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #if HAVE_SYS_TYPES_H
@@ -133159,220 +103917,35 @@ if (sizeof (uint32_t))
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_UINT32_T 1
 _ACEOF
 
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}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.$ac_ext
 
-
 for ac_func in vprintf
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+do :
+  ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
+if test "x$ac_cv_func_vprintf" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_VPRINTF 1
 _ACEOF
 
-{ echo "$as_me:$LINENO: checking for _doprnt" >&5
-echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6; }
-if test "${ac_cv_func__doprnt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define _doprnt innocuous__doprnt
+ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
+if test "x$ac_cv_func__doprnt" = x""yes; then :
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char _doprnt (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef _doprnt
-
-/* 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 _doprnt ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub__doprnt || defined __stub____doprnt
-choke me
-#endif
-
-int
-main ()
-{
-return _doprnt ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func__doprnt=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func__doprnt=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
-echo "${ECHO_T}$ac_cv_func__doprnt" >&6; }
-if test $ac_cv_func__doprnt = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DOPRNT 1
-_ACEOF
+$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
 
 fi
 
@@ -133380,19 +103953,15 @@ fi
 done
 
 
-{ echo "$as_me:$LINENO: checking for working memcmp" >&5
-echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; }
-if test "${ac_cv_func_memcmp_working+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
+$as_echo_n "checking for working memcmp... " >&6; }
+if test "${ac_cv_func_memcmp_working+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_func_memcmp_working=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -133427,42 +103996,18 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_memcmp_working=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_memcmp_working=no
+  ac_cv_func_memcmp_working=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
-echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
+$as_echo "$ac_cv_func_memcmp_working" >&6; }
 test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
   *" memcmp.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
@@ -133472,16 +104017,12 @@ esac
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ echo "$as_me:$LINENO: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if test "${ac_cv_working_alloca_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <alloca.h>
 int
@@ -133493,55 +104034,28 @@ char *p = (char *) alloca (2 * sizeof (int));
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_working_alloca_h=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_working_alloca_h=no
+  ac_cv_working_alloca_h=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA_H 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-{ echo "$as_me:$LINENO: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if test "${ac_cv_func_alloca_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -133573,43 +104087,20 @@ char *p = (char *) alloca (1);
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_func_alloca_works=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_alloca_works=no
+  ac_cv_func_alloca_works=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
 
 else
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -133619,21 +104110,15 @@ else
 
 ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
-cat >>confdefs.h <<\_ACEOF
-#define C_ALLOCA 1
-_ACEOF
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
 
 
-{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }
-if test "${ac_cv_os_cray+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if test "${ac_cv_os_cray+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #if defined CRAY && ! defined CRAY2
 webecray
@@ -133643,102 +104128,22 @@ wenotbecray
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then
+  $EGREP "webecray" >/dev/null 2>&1; then :
   ac_cv_os_cray=yes
 else
   ac_cv_os_cray=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -133750,19 +104155,15 @@ fi
   done
 fi
 
-{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if test "${ac_cv_c_stack_direction+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_c_stack_direction=0
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -133785,43 +104186,18 @@ main ()
   return find_stack_direction () < 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_stack_direction=1
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_stack_direction=-1
+  ac_cv_c_stack_direction=-1
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
 cat >>confdefs.h <<_ACEOF
 #define STACK_DIRECTION $ac_cv_c_stack_direction
 _ACEOF
@@ -133829,169 +104205,52 @@ _ACEOF
 
 fi
 
-
-
-
-
-
-
-
-
-
 for ac_func in memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+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"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
-  { echo "$as_me:$LINENO: checking whether sprintf is broken" >&5
-echo $ECHO_N "checking whether sprintf is broken... $ECHO_C" >&6; }
-if test "${ac_cv_broken_sprintf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sprintf is broken" >&5
+$as_echo_n "checking whether sprintf is broken... " >&6; }
+if test "${ac_cv_broken_sprintf+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    if test "$cross_compiling" = yes; then
+    if test "$cross_compiling" = yes; then :
 
       ac_cv_broken_sprintf=no
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
       ac_cv_broken_sprintf=no
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
       ac_cv_broken_sprintf=yes
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_broken_sprintf" >&5
-echo "${ECHO_T}$ac_cv_broken_sprintf" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_sprintf" >&5
+$as_echo "$ac_cv_broken_sprintf" >&6; }
   if test "$ac_cv_broken_sprintf" = "yes"; then
     ac_result=1
   else
@@ -134004,98 +104263,14 @@ _ACEOF
 
 
 
-
-
-
-
 for ac_func in finite isfinite isinf isnan
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+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"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -134103,17 +104278,13 @@ done
 
 
 
-  { echo "$as_me:$LINENO: checking whether fp_except is defined" >&5
-echo $ECHO_N "checking whether fp_except is defined... $ECHO_C" >&6; }
-if test "${ac_cv_type_fp_except+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fp_except is defined" >&5
+$as_echo_n "checking whether fp_except is defined... " >&6; }
+if test "${ac_cv_type_fp_except+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <floatingpoint.h>
@@ -134128,56 +104299,30 @@ fp_except x = (fp_except) 0;
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
      ac_cv_type_fp_except=yes
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
      ac_cv_type_fp_except=no
 
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_fp_except" >&5
-echo "${ECHO_T}$ac_cv_type_fp_except" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_fp_except" >&5
+$as_echo "$ac_cv_type_fp_except" >&6; }
   if test "$ac_cv_type_fp_except" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FP_EXCEPT 1
-_ACEOF
+$as_echo "#define HAVE_FP_EXCEPT 1" >>confdefs.h
 
   fi
 
 
 
-  { echo "$as_me:$LINENO: checking for usable _FPU_SETCW" >&5
-echo $ECHO_N "checking for usable _FPU_SETCW... $ECHO_C" >&6; }
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable _FPU_SETCW" >&5
+$as_echo_n "checking for usable _FPU_SETCW... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
     #include <fpu_control.h>
@@ -134201,54 +104346,27 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cfp_have__fpu_setcw=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cfp_have__fpu_setcw=no
+  ac_cfp_have__fpu_setcw=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   if test "$ac_cfp_have__fpu_setcw" = "yes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE__FPU_SETCW 1
-_ACEOF
+$as_echo "#define HAVE__FPU_SETCW 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
-  { echo "$as_me:$LINENO: checking for usable fpsetprec" >&5
-echo $ECHO_N "checking for usable fpsetprec... $ECHO_C" >&6; }
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable fpsetprec" >&5
+$as_echo_n "checking for usable fpsetprec... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
     #include <machine/ieeefp.h>
@@ -134271,54 +104389,27 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cfp_have_fpsetprec=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cfp_have_fpsetprec=no
+  ac_cfp_have_fpsetprec=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   if test "$ac_cfp_have_fpsetprec" = "yes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FPSETPREC 1
-_ACEOF
+$as_echo "#define HAVE_FPSETPREC 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
-  { echo "$as_me:$LINENO: checking for usable _controlfp" >&5
-echo $ECHO_N "checking for usable _controlfp... $ECHO_C" >&6; }
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable _controlfp" >&5
+$as_echo_n "checking for usable _controlfp... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
     #include <float.h>
@@ -134341,54 +104432,27 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cfp_have__controlfp=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cfp_have__controlfp=no
+  ac_cfp_have__controlfp=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   if test "$ac_cfp_have__controlfp" = "yes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE__CONTROLFP 1
-_ACEOF
+$as_echo "#define HAVE__CONTROLFP 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
-  { echo "$as_me:$LINENO: checking for usable _controlfp_s" >&5
-echo $ECHO_N "checking for usable _controlfp_s... $ECHO_C" >&6; }
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable _controlfp_s" >&5
+$as_echo_n "checking for usable _controlfp_s... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
    #include <float.h>
@@ -134412,54 +104476,27 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cfp_have__controlfp_s=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cfp_have__controlfp_s=no
+  ac_cfp_have__controlfp_s=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   if test "$ac_cfp_have__controlfp_s" = "yes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE__CONTROLFP_S 1
-_ACEOF
+$as_echo "#define HAVE__CONTROLFP_S 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
-  { echo "$as_me:$LINENO: checking whether FPU control word can be manipulated by inline assembler" >&5
-echo $ECHO_N "checking whether FPU control word can be manipulated by inline assembler... $ECHO_C" >&6; }
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether FPU control word can be manipulated by inline assembler" >&5
+$as_echo_n "checking whether FPU control word can be manipulated by inline assembler... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
     /* nothing */
@@ -134485,62 +104522,35 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cfp_have_fpu_inline_asm_x86=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cfp_have_fpu_inline_asm_x86=no
+  ac_cfp_have_fpu_inline_asm_x86=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   if test "$ac_cfp_have_fpu_inline_asm_x86" = "yes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FPU_INLINE_ASM_X86 1
-_ACEOF
+$as_echo "#define HAVE_FPU_INLINE_ASM_X86 1" >>confdefs.h
 
-    { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-{ echo "$as_me:$LINENO: checking whether double cast to long preserves least significant bits" >&5
-echo $ECHO_N "checking whether double cast to long preserves least significant bits... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether double cast to long preserves least significant bits" >&5
+$as_echo_n "checking whether double cast to long preserves least significant bits... " >&6; }
 
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
 
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <limits.h>
@@ -134564,186 +104574,32 @@ int main()
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define ZEND_DVAL_TO_LVAL_CAST_OK 1
-_ACEOF
+$as_echo "#define ZEND_DVAL_TO_LVAL_CAST_OK 1" >>confdefs.h
 
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-( exit $ac_status )
-
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
 
-
-
 for ac_header in dlfcn.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_DLFCN_H 1
 _ACEOF
 
 fi
@@ -134751,15 +104607,15 @@ fi
 done
 
 
-{ echo "$as_me:$LINENO: checking whether dlsym() requires a leading underscore in symbol names" >&5
-echo $ECHO_N "checking whether dlsym() requires a leading underscore in symbol names... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether dlsym() requires a leading underscore in symbol names" >&5
+$as_echo_n "checking whether dlsym() requires a leading underscore in symbol names... " >&6; }
 if test "$cross_compiling" = yes; then :
 
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 134762 "configure"
+#line 104618 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -134822,37 +104678,35 @@ int main ()
     exit (status);
 }
 EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore)
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
  ;;
       x$lt_dlneed_uscore)
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define DLSYM_NEEDS_UNDERSCORE 1
-_ACEOF
+$as_echo "#define DLSYM_NEEDS_UNDERSCORE 1" >>confdefs.h
 
  ;;
       x$lt_dlunknown|x*)
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
  ;;
     esac
   else :
     # compilation failed
 
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
   fi
 fi
@@ -134863,7 +104717,7 @@ rm -fr conftest*
 
 
 # Check whether --with-zend-vm was given.
-if test "${with_zend_vm+set}" = set; then
+if test "${with_zend_vm+set}" = set; then :
   withval=$with_zend_vm;
   PHP_ZEND_VM=$withval
 
@@ -134875,7 +104729,7 @@ fi
 
 
 # Check whether --enable-maintainer-zts was given.
-if test "${enable_maintainer_zts+set}" = set; then
+if test "${enable_maintainer_zts+set}" = set; then :
   enableval=$enable_maintainer_zts;
   ZEND_MAINTAINER_ZTS=$enableval
 
@@ -134887,7 +104741,7 @@ fi
 
 
 # Check whether --enable-inline-optimization was given.
-if test "${enable_inline_optimization+set}" = set; then
+if test "${enable_inline_optimization+set}" = set; then :
   enableval=$enable_inline_optimization;
   ZEND_INLINE_OPTIMIZATION=$enableval
 
@@ -134898,56 +104752,48 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking virtual machine dispatch method" >&5
-echo $ECHO_N "checking virtual machine dispatch method... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $PHP_ZEND_VM" >&5
-echo "${ECHO_T}$PHP_ZEND_VM" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking virtual machine dispatch method" >&5
+$as_echo_n "checking virtual machine dispatch method... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_ZEND_VM" >&5
+$as_echo "$PHP_ZEND_VM" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to enable thread-safety" >&5
-echo $ECHO_N "checking whether to enable thread-safety... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $ZEND_MAINTAINER_ZTS" >&5
-echo "${ECHO_T}$ZEND_MAINTAINER_ZTS" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable thread-safety" >&5
+$as_echo_n "checking whether to enable thread-safety... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZEND_MAINTAINER_ZTS" >&5
+$as_echo "$ZEND_MAINTAINER_ZTS" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to enable inline optimization for GCC" >&5
-echo $ECHO_N "checking whether to enable inline optimization for GCC... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $ZEND_INLINE_OPTIMIZATION" >&5
-echo "${ECHO_T}$ZEND_INLINE_OPTIMIZATION" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable inline optimization for GCC" >&5
+$as_echo_n "checking whether to enable inline optimization for GCC... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZEND_INLINE_OPTIMIZATION" >&5
+$as_echo "$ZEND_INLINE_OPTIMIZATION" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to enable Zend debugging" >&5
-echo $ECHO_N "checking whether to enable Zend debugging... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $ZEND_DEBUG" >&5
-echo "${ECHO_T}$ZEND_DEBUG" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend debugging" >&5
+$as_echo_n "checking whether to enable Zend debugging... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZEND_DEBUG" >&5
+$as_echo "$ZEND_DEBUG" >&6; }
 
 case $PHP_ZEND_VM in
   SWITCH)
 
-cat >>confdefs.h <<\_ACEOF
-#define ZEND_VM_KIND ZEND_VM_KIND_SWITCH
-_ACEOF
+$as_echo "#define ZEND_VM_KIND ZEND_VM_KIND_SWITCH" >>confdefs.h
 
     ;;
   GOTO)
 
-cat >>confdefs.h <<\_ACEOF
-#define ZEND_VM_KIND ZEND_VM_KIND_GOTO
-_ACEOF
+$as_echo "#define ZEND_VM_KIND ZEND_VM_KIND_GOTO" >>confdefs.h
 
     ;;
   *)
     PHP_ZEND_VM=CALL
 
-cat >>confdefs.h <<\_ACEOF
-#define ZEND_VM_KIND ZEND_VM_KIND_CALL
-_ACEOF
+$as_echo "#define ZEND_VM_KIND ZEND_VM_KIND_CALL" >>confdefs.h
 
     ;;
 esac
 
 if test "$ZEND_DEBUG" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define ZEND_DEBUG 1
-_ACEOF
+$as_echo "#define ZEND_DEBUG 1" >>confdefs.h
 
   echo " $CFLAGS" | grep ' -g' >/dev/null || DEBUG_CFLAGS="-g"
   if test "$CFLAGS" = "-g -O2"; then
@@ -134958,9 +104804,7 @@ _ACEOF
     DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations"
 else
 
-cat >>confdefs.h <<\_ACEOF
-#define ZEND_DEBUG 0
-_ACEOF
+$as_echo "#define ZEND_DEBUG 0" >>confdefs.h
 
 fi
 
@@ -134968,9 +104812,7 @@ test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
 
 if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define ZTS 1
-_ACEOF
+$as_echo "#define ZTS 1" >>confdefs.h
 
   CFLAGS="$CFLAGS -DZTS"
 
@@ -134986,18 +104828,14 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
-if test "${ac_cv_c_inline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if test "${ac_cv_c_inline+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __cplusplus
 typedef int foo_t;
@@ -135006,39 +104844,16 @@ $ac_kw foo_t foo () {return 0; }
 #endif
 
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_inline=$ac_kw
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   test "$ac_cv_c_inline" != no && break
 done
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6; }
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
 
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -135058,34 +104873,28 @@ esac
 
 
 
-{ echo "$as_me:$LINENO: checking target system is Darwin" >&5
-echo $ECHO_N "checking target system is Darwin... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system is Darwin" >&5
+$as_echo_n "checking target system is Darwin... " >&6; }
 if echo "$target" | grep "darwin" > /dev/null; then
 
-cat >>confdefs.h <<\_ACEOF
-#define DARWIN 1
-_ACEOF
+$as_echo "#define DARWIN 1" >>confdefs.h
 
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking for MM alignment and log values" >&5
-echo $ECHO_N "checking for MM alignment and log values... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MM alignment and log values" >&5
+$as_echo_n "checking for MM alignment and log values... " >&6; }
 
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
 
     LIBZEND_MM_ALIGN=8
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -135121,26 +104930,7 @@ int main()
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
   LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1`
   LIBZEND_MM_ALIGN_LOG2=`cat conftest.zend | cut -d ' ' -f 2`
@@ -135155,34 +104945,25 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
 
-{ echo "$as_me:$LINENO: result: done" >&5
-echo "${ECHO_T}done" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for memory allocation using mmap(MAP_ANON)" >&5
+$as_echo_n "checking for memory allocation using mmap(MAP_ANON)... " >&6; }
 
-{ echo "$as_me:$LINENO: checking for memory allocation using mmap(MAP_ANON)" >&5
-echo $ECHO_N "checking for memory allocation using mmap(MAP_ANON)... $ECHO_C" >&6; }
-
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
 
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -135218,65 +104999,35 @@ int main()
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MEM_MMAP_ANON 1
-_ACEOF
+$as_echo "#define HAVE_MEM_MMAP_ANON 1" >>confdefs.h
 
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for memory allocation using mmap(\"/dev/zero\")" >&5
+$as_echo_n "checking for memory allocation using mmap(\"/dev/zero\")... " >&6; }
 
-{ echo "$as_me:$LINENO: checking for memory allocation using mmap(\"/dev/zero\")" >&5
-echo $ECHO_N "checking for memory allocation using mmap(\"/dev/zero\")... $ECHO_C" >&6; }
-
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
 
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -135322,140 +105073,31 @@ int main()
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MEM_MMAP_ZERO 1
-_ACEOF
+$as_echo "#define HAVE_MEM_MMAP_ZERO 1" >>confdefs.h
 
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
 
-
-
 for ac_func in mremap
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+do :
+  ac_fn_c_check_func "$LINENO" "mremap" "ac_cv_func_mremap"
+if test "x$ac_cv_func_mremap" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_MREMAP 1
 _ACEOF
 
 fi
@@ -135464,7 +105106,7 @@ done
 
 
 # Check whether --enable-zend-signals was given.
-if test "${enable_zend_signals+set}" = set; then
+if test "${enable_zend_signals+set}" = set; then :
   enableval=$enable_zend_signals;
   ZEND_SIGNALS=$enableval
 
@@ -135475,93 +105117,11 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking for sigaction" >&5
-echo $ECHO_N "checking for sigaction... $ECHO_C" >&6; }
-if test "${ac_cv_func_sigaction+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define sigaction to an innocuous variant, in case <limits.h> declares sigaction.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define sigaction innocuous_sigaction
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char sigaction (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef sigaction
-
-/* 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 sigaction ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_sigaction || defined __stub___sigaction
-choke me
-#endif
-
-int
-main ()
-{
-return sigaction ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_sigaction=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_sigaction=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_sigaction" >&5
-echo "${ECHO_T}$ac_cv_func_sigaction" >&6; }
-if test $ac_cv_func_sigaction = yes; then
+ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction"
+if test "x$ac_cv_func_sigaction" = x""yes; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SIGACTION 1
-_ACEOF
+$as_echo "#define HAVE_SIGACTION 1" >>confdefs.h
 
 
 else
@@ -135572,25 +105132,21 @@ fi
 
 if test "$ZEND_SIGNALS" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define ZEND_SIGNALS 1
-_ACEOF
+$as_echo "#define ZEND_SIGNALS 1" >>confdefs.h
 
 	CFLAGS="$CFLAGS -DZEND_SIGNALS"
 fi
 
-{ echo "$as_me:$LINENO: checking whether to enable zend signal handling" >&5
-echo $ECHO_N "checking whether to enable zend signal handling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $ZEND_SIGNALS" >&5
-echo "${ECHO_T}$ZEND_SIGNALS" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable zend signal handling" >&5
+$as_echo_n "checking whether to enable zend signal handling... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZEND_SIGNALS" >&5
+$as_echo "$ZEND_SIGNALS" >&6; }
 
 
 
 if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define ZTS 1
-_ACEOF
+$as_echo "#define ZTS 1" >>confdefs.h
 
   PHP_THREAD_SAFETY=yes
 else
@@ -135610,154 +105166,26 @@ unset LIBS LDFLAGS
 
 
 # Check whether --enable- was given.
-if test "${enable_+set}" = set; then
+if test "${enable_+set}" = set; then :
   enableval=$enable_;
 fi
 
 
 
-  { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-  { echo "$as_me:$LINENO: result: ${T_MD}Configuring TSRM${T_ME}" >&5
-echo "${ECHO_T}${T_MD}Configuring TSRM${T_ME}" >&6; }
-
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring TSRM${T_ME}" >&5
+$as_echo "${T_MD}Configuring TSRM${T_ME}" >&6; }
 
 
 
 
 for ac_header in stdarg.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "stdarg.h" "ac_cv_header_stdarg_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdarg_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_STDARG_H 1
 _ACEOF
 
 fi
@@ -135765,95 +105193,12 @@ fi
 done
 
 
-
 for ac_func in sigprocmask
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+do :
+  ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask"
+if test "x$ac_cv_func_sigprocmask" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_SIGPROCMASK 1
 _ACEOF
 
 fi
@@ -135867,7 +105212,7 @@ if test "$PHP_THREAD_SAFETY" = "yes"; then
 
 
 # Check whether --with-tsrm-pth was given.
-if test "${with_tsrm_pth+set}" = set; then
+if test "${with_tsrm_pth+set}" = set; then :
   withval=$with_tsrm_pth;
   TSRM_PTH=$withval
 
@@ -135880,7 +105225,7 @@ fi
 
 
 # Check whether --with-tsrm-st was given.
-if test "${with_tsrm_st+set}" = set; then
+if test "${with_tsrm_st+set}" = set; then :
   withval=$with_tsrm_st;
   TSRM_ST=$withval
 
@@ -135893,7 +105238,7 @@ fi
 
 
 # Check whether --with-tsrm-pthreads was given.
-if test "${with_tsrm_pthreads+set}" = set; then
+if test "${with_tsrm_pthreads+set}" = set; then :
   withval=$with_tsrm_pthreads;
   TSRM_PTHREADS=$withval
 
@@ -135909,12 +105254,12 @@ test "$TSRM_PTH" = "yes" && TSRM_PTH=pth-config
 if test "$TSRM_PTH" != "no"; then
 
 
-{ echo "$as_me:$LINENO: checking for GNU Pth" >&5
-echo $ECHO_N "checking for GNU Pth... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU Pth" >&5
+$as_echo_n "checking for GNU Pth... " >&6; }
 PTH_PREFIX="`$TSRM_PTH --prefix`"
 if test -z "$PTH_PREFIX"; then
-  { echo "$as_me:$LINENO: result: Please check your Pth installation" >&5
-echo "${ECHO_T}Please check your Pth installation" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Please check your Pth installation" >&5
+$as_echo "Please check your Pth installation" >&6; }
 fi
 
 CPPFLAGS="$CPPFLAGS `$TSRM_PTH --cflags`"
@@ -135922,12 +105267,10 @@ LDFLAGS="$LDFLAGS `$TSRM_PTH --ldflags`"
 LIBS="$LIBS `$TSRM_PTH --libs`"
 
 
-cat >>confdefs.h <<\_ACEOF
-#define GNUPTH 1
-_ACEOF
+$as_echo "#define GNUPTH 1" >>confdefs.h
 
-{ echo "$as_me:$LINENO: result: yes - installed in $PTH_PREFIX" >&5
-echo "${ECHO_T}yes - installed in $PTH_PREFIX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - installed in $PTH_PREFIX" >&5
+$as_echo "yes - installed in $PTH_PREFIX" >&6; }
 
 
 elif test "$TSRM_ST" != "no"; then
@@ -135939,161 +105282,29 @@ elif test "$TSRM_ST" != "no"; then
     CPPFLAGS="$CPPFLAGS -I$TSRM_ST"
     LDFLAGS="$LDFLAGS -L$TSRM_ST"
   fi
-
-for ac_header in st.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  for ac_header in st.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "st.h" "ac_cv_header_st_h" "$ac_includes_default"
+if test "x$ac_cv_header_st_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_ST_H 1
 _ACEOF
 
 else
 
-    { { echo "$as_me:$LINENO: error: Sorry, I was unable to locate the State Threads header file.  Please specify the prefix using --with-tsrm-st=/prefix" >&5
-echo "$as_me: error: Sorry, I was unable to locate the State Threads header file.  Please specify the prefix using --with-tsrm-st=/prefix" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Sorry, I was unable to locate the State Threads header file.  Please specify the prefix using --with-tsrm-st=/prefix" "$LINENO" 5
 
 fi
 
 done
 
   LIBS="$LIBS -lst"
-  { echo "$as_me:$LINENO: checking for SGI's State Threads" >&5
-echo $ECHO_N "checking for SGI's State Threads... $ECHO_C" >&6; }
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SGI's State Threads" >&5
+$as_echo_n "checking for SGI's State Threads... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define TSRM_ST 1
-_ACEOF
+$as_echo "#define TSRM_ST 1" >>confdefs.h
 
 
 elif test "$TSRM_PTHREADS" != "no"; then
@@ -136117,7 +105328,7 @@ if test -n "$ac_cv_pthreads_cflags"; then
 fi
 
 
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
 
     pthreads_working=no
   case $host_alias in
@@ -136127,11 +105338,7 @@ if test "$cross_compiling" = yes; then
 
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <pthread.h>
@@ -136149,50 +105356,26 @@ int main() {
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
   pthreads_working=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
   pthreads_working=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
   LIBS=$save_LIBS
   CFLAGS=$save_CFLAGS
 
-  { echo "$as_me:$LINENO: checking for pthreads_cflags" >&5
-echo $ECHO_N "checking for pthreads_cflags... $ECHO_C" >&6; }
-if test "${ac_cv_pthreads_cflags+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5
+$as_echo_n "checking for pthreads_cflags... " >&6; }
+if test "${ac_cv_pthreads_cflags+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
   ac_cv_pthreads_cflags=
@@ -136201,7 +105384,7 @@ else
       ac_save=$CFLAGS
       CFLAGS="$CFLAGS $flag"
 
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
 
     pthreads_working=no
   case $host_alias in
@@ -136211,11 +105394,7 @@ if test "$cross_compiling" = yes; then
 
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <pthread.h>
@@ -136233,43 +105412,19 @@ int main() {
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
   pthreads_working=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
   pthreads_working=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
       CFLAGS=$ac_save
       if test "$pthreads_working" = "yes"; then
         ac_cv_pthreads_cflags=$flag
@@ -136280,13 +105435,13 @@ fi
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_pthreads_cflags" >&5
-echo "${ECHO_T}$ac_cv_pthreads_cflags" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags" >&5
+$as_echo "$ac_cv_pthreads_cflags" >&6; }
 
-{ echo "$as_me:$LINENO: checking for pthreads_lib" >&5
-echo $ECHO_N "checking for pthreads_lib... $ECHO_C" >&6; }
-if test "${ac_cv_pthreads_lib+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5
+$as_echo_n "checking for pthreads_lib... " >&6; }
+if test "${ac_cv_pthreads_lib+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 ac_cv_pthreads_lib=
@@ -136295,7 +105450,7 @@ if test "$pthreads_working" != "yes"; then
     ac_save=$LIBS
     LIBS="$LIBS -l$lib"
 
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
 
     pthreads_working=no
   case $host_alias in
@@ -136305,11 +105460,7 @@ if test "$cross_compiling" = yes; then
 
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <pthread.h>
@@ -136327,43 +105478,19 @@ int main() {
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
   pthreads_working=yes
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
   pthreads_working=no
 
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
 
-
     LIBS=$ac_save
     if test "$pthreads_working" = "yes"; then
       ac_cv_pthreads_lib=$lib
@@ -136373,8 +105500,8 @@ fi
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_pthreads_lib" >&5
-echo "${ECHO_T}$ac_cv_pthreads_lib" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_lib" >&5
+$as_echo "$ac_cv_pthreads_lib" >&6; }
 
 if test "$pthreads_working" = "yes"; then
   threads_result="POSIX-Threads found"
@@ -136385,27 +105512,21 @@ fi
 
 if test "$beos_threads" = "1"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define BETHREADS 1
-_ACEOF
+$as_echo "#define BETHREADS 1" >>confdefs.h
 
 else
   if test "$pthreads_working" != "yes"; then
-    { { echo "$as_me:$LINENO: error: Your system seems to lack POSIX threads." >&5
-echo "$as_me: error: Your system seems to lack POSIX threads." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "Your system seems to lack POSIX threads." "$LINENO" 5
   fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define PTHREADS 1
-_ACEOF
+$as_echo "#define PTHREADS 1" >>confdefs.h
 
 
-  { echo "$as_me:$LINENO: checking for POSIX threads" >&5
-echo $ECHO_N "checking for POSIX threads... $ECHO_C" >&6; }
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX threads" >&5
+$as_echo_n "checking for POSIX threads... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 fi
@@ -136898,16 +106019,16 @@ ZEND_EXT_TYPE="zend_extension"
 
 
 # Check whether --enable- was given.
-if test "${enable_+set}" = set; then
+if test "${enable_+set}" = set; then :
   enableval=$enable_;
 fi
 
 
 
-  { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-  { echo "$as_me:$LINENO: result: ${T_MD}Configuring libtool${T_ME}" >&5
-echo "${ECHO_T}${T_MD}Configuring libtool${T_ME}" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring libtool${T_ME}" >&5
+$as_echo "${T_MD}Configuring libtool${T_ME}" >&6; }
 
 
 LDFLAGS="$LDFLAGS $PHP_AIX_LDFLAGS"
@@ -136920,7 +106041,7 @@ esac
 
 
 # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then
+if test "${enable_shared+set}" = set; then :
   enableval=$enable_shared;     p=${PACKAGE-default}
     case $enableval in
     yes) enable_shared=yes ;;
@@ -136944,7 +106065,7 @@ fi
 
 
 # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then
+if test "${enable_static+set}" = set; then :
   enableval=$enable_static;     p=${PACKAGE-default}
     case $enableval in
     yes) enable_static=yes ;;
@@ -136968,7 +106089,7 @@ fi
 
 
 # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
+if test "${enable_fast_install+set}" = set; then :
   enableval=$enable_fast_install;     p=${PACKAGE-default}
     case $enableval in
     yes) enable_fast_install=yes ;;
@@ -136993,7 +106114,7 @@ fi
 
 
 # Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
+if test "${with_gnu_ld+set}" = set; then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
@@ -137002,8 +106123,8 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -137032,14 +106153,14 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "${lt_cv_path_LD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -137069,19 +106190,17 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
@@ -137093,20 +106212,20 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
-{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if test "${lt_cv_ld_reload_flag+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -137123,10 +106242,10 @@ case $host_os in
     ;;
 esac
 
-{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
-if test "${lt_cv_path_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD-compatible nm" >&5
+$as_echo_n "checking for BSD-compatible nm... " >&6; }
+if test "${lt_cv_path_NM+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
@@ -137172,14 +106291,14 @@ else
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 fi
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
 NM="$lt_cv_path_NM"
 
-{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if test "${lt_cv_deplibs_check_method+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -137362,8 +106481,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 esac
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -137390,11 +106509,11 @@ case $host in
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *ELF-32*)
       HPUX_IA64_MODE="32"
@@ -137408,12 +106527,12 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 137411 "configure"' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  echo '#line 106530 "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
    if test "$lt_cv_prog_gnu_ld" = yes; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
@@ -137447,11 +106566,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
 s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
     case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
@@ -137500,10 +106619,10 @@ s390*-*linux*|sparc*-*linux*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if test "${lt_cv_cc_needs_belf+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
      ac_ext=c
@@ -137512,11 +106631,7 @@ 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
 
-     cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -137527,34 +106642,13 @@ main ()
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   lt_cv_cc_needs_belf=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	lt_cv_cc_needs_belf=no
+  lt_cv_cc_needs_belf=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -137562,8 +106656,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -137572,11 +106666,11 @@ echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
 sparc*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
@@ -137609,11 +106703,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&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; }
 if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
     for CXXCPP in "$CXX -E" "/lib/cpp"
@@ -137627,11 +106721,7 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -137640,76 +106730,34 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+if $ac_preproc_ok; then :
   break
 fi
 
@@ -137721,8 +106769,8 @@ fi
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -137732,11 +106780,7 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -137745,83 +106789,40 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+if $ac_preproc_ok; then :
+
 else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $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 \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=cpp
@@ -137835,10 +106836,10 @@ fi
 
 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
 # find the maximum length of command line arguments
-{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
     i=0
   teststring="ABCD"
@@ -137947,11 +106948,11 @@ else
 fi
 
 if test -n $lt_cv_sys_max_cmd_len ; then
-  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
 fi
 
 
@@ -137959,10 +106960,10 @@ fi
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
 # These are sane defaults that work on at least a few old systems.
@@ -138064,18 +107065,18 @@ void nm_test_func(){}
 int main(){nm_test_var='a';nm_test_func();return(0);}
 EOF
 
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s "$nlist"; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -138126,11 +107127,11 @@ EOF
 	  lt_save_CFLAGS="$CFLAGS"
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
 	  LIBS="$lt_save_LIBS"
@@ -138164,17 +107165,17 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 else
-  { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
-if test "${lt_cv_objdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if test "${lt_cv_objdir+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
@@ -138186,8 +107187,8 @@ else
 fi
 rmdir .libs 2>/dev/null
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
 
@@ -138238,10 +107239,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -138251,25 +107252,25 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -138278,10 +107279,10 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; 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.
@@ -138291,25 +107292,25 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AR="ar"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
@@ -138317,12 +107318,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&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
@@ -138334,10 +107331,10 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -138347,25 +107344,25 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -138374,10 +107371,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -138387,25 +107384,25 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -138413,12 +107410,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -138430,10 +107423,10 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -138443,25 +107436,25 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -138470,10 +107463,10 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -138483,25 +107476,25 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -138509,12 +107502,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -138577,10 +107566,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -138630,19 +107619,19 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { echo "$as_me:$LINENO: checking for file" >&5
-echo $ECHO_N "checking for file... $ECHO_C" >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -138692,11 +107681,11 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   else
@@ -138714,10 +107703,10 @@ esac
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$DSYMUTIL"; then
   ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
@@ -138727,25 +107716,25 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-echo "${ECHO_T}$DSYMUTIL" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -138754,10 +107743,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DSYMUTIL"; then
   ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
@@ -138767,25 +107756,25 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_DSYMUTIL" = x; then
@@ -138793,12 +107782,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DSYMUTIL=$ac_ct_DSYMUTIL
@@ -138810,10 +107795,10 @@ fi
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$NMEDIT"; then
   ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
@@ -138823,25 +107808,25 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { echo "$as_me:$LINENO: result: $NMEDIT" >&5
-echo "${ECHO_T}$NMEDIT" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -138850,10 +107835,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_NMEDIT"; then
   ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
@@ -138863,25 +107848,25 @@ 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
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    echo "$as_me:$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
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_NMEDIT" = x; then
@@ -138889,12 +107874,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     NMEDIT=$ac_ct_NMEDIT
@@ -138904,10 +107885,10 @@ else
 fi
 
 
-    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_apple_cc_single_mod=no
       if test -z "${LT_MULTI_MODULE}"; then
@@ -138925,12 +107906,12 @@ else
    rm conftest.c
       fi
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
-    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_exported_symbols_list=no
       save_LDFLAGS=$LDFLAGS
@@ -138938,16 +107919,16 @@ else
       LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
 
 cat > conftest.$ac_ext <<EOF
-#line 138941 "configure"
+#line 107922 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  lt_cv_ld_exported_symbols_list=yes
   rm -rf conftest*
 else
@@ -138960,8 +107941,8 @@ rm -f conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
     case $host_os in
     rhapsody* | darwin1.[0123])
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -139002,7 +107983,7 @@ enable_dlopen=no
 enable_win32_dll=no
 
 # Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
+if test "${enable_libtool_lock+set}" = set; then :
   enableval=$enable_libtool_lock;
 fi
 
@@ -139010,7 +107991,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
 
 # Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then
+if test "${with_pic+set}" = set; then :
   withval=$with_pic; pic_mode="$withval"
 else
   pic_mode=default
@@ -139078,10 +108059,10 @@ if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
@@ -139096,11 +108077,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:139099: $lt_compile\"" >&5)
+   (eval echo "\"configure:108080: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "configure:139103: \$? = $ac_status" >&5
+   echo "configure:108084: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -139113,8 +108094,8 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -139128,8 +108109,8 @@ lt_prog_compiler_wl=
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -139368,18 +108349,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works=no
   ac_outfile=conftest.$ac_objext
@@ -139394,11 +108375,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:139397: $lt_compile\"" >&5)
+   (eval echo "\"configure:108378: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "configure:139401: \$? = $ac_status" >&5
+   echo "configure:108382: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -139411,8 +108392,8 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
@@ -139439,10 +108420,10 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
@@ -139467,8 +108448,8 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works" = xyes; then
     :
@@ -139477,10 +108458,10 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
    $rm -r conftest 2>/dev/null
@@ -139498,11 +108479,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:139501: $lt_compile\"" >&5)
+   (eval echo "\"configure:108482: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "configure:139505: \$? = $ac_status" >&5
+   echo "configure:108486: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -139524,34 +108505,34 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag=
@@ -139962,16 +108943,16 @@ _LT_EOF
        # Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 139965 "configure"
+#line 108946 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -140004,16 +108985,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	 # Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 140007 "configure"
+#line 108988 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -140482,8 +109463,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-echo "${ECHO_T}$ld_shlibs" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
 test "$ld_shlibs" = no && can_build_shared=no
 
 #
@@ -140503,16 +109484,16 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
         soname=conftest
         lib=conftest
         libobjs=conftest.$ac_objext
@@ -140526,11 +109507,11 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         libname=conftest
         lt_save_allow_undefined_flag=$allow_undefined_flag
         allow_undefined_flag=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
         then
 	  archive_cmds_need_lc=no
         else
@@ -140541,16 +109522,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -141151,19 +110132,19 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
 fi
 
 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 fi
@@ -141175,14 +110156,14 @@ if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
    test -n "$runpath_var" || \
    test "X$hardcode_automatic" = "Xyes" ; then
 
-  # We can hardcode non-existant directories.
+  # We can hardcode non-existent directories.
   if test "$hardcode_direct" != no &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library
@@ -141200,8 +110181,8 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
 
 if test "$hardcode_action" = relink; then
   # Fast installation is not supported
@@ -141214,13 +110195,13 @@ fi
 
 striplib=
 old_striplib=
-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
@@ -141228,16 +110209,16 @@ else
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
          old_striplib="$STRIP -S"
-         { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
        else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
        ;;
    *)
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     ;;
   esac
 fi
@@ -141269,18 +110250,14 @@ else
 
   darwin*)
   # if libdl is installed we need to link against it
-    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -141298,39 +110275,18 @@ return dlopen ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
+  ac_cv_lib_dl_dlopen=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
 
@@ -141343,102 +110299,18 @@ fi
    ;;
 
   *)
-    { echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* 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 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_shl_load || defined __stub___shl_load
-choke me
-#endif
-
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_shl_load=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-if test $ac_cv_func_shl_load = yes; then
+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = x""yes; then :
   lt_cv_dlopen="shl_load"
 else
-  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $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 test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -141456,137 +110328,32 @@ return shl_load ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dld_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dld_shl_load=no
+  ac_cv_lib_dld_shl_load=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-if test $ac_cv_lib_dld_shl_load = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
-  { echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* 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 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_dlopen || defined __stub___dlopen
-choke me
-#endif
-
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_dlopen=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-if test $ac_cv_func_dlopen = yes; then
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen"
 else
-  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -141604,53 +110371,28 @@ return dlopen ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
+  ac_cv_lib_dl_dlopen=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -141668,53 +110410,28 @@ return dlopen ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_svld_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_svld_dlopen=no
+  ac_cv_lib_svld_dlopen=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-if test $ac_cv_lib_svld_dlopen = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -141732,39 +110449,18 @@ return dld_link ();
   return 0;
 }
 _ACEOF
-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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dld_dld_link=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dld_dld_link=no
+  ac_cv_lib_dld_dld_link=no
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-if test $ac_cv_lib_dld_dld_link = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
@@ -141803,10 +110499,10 @@ fi
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if test "${lt_cv_dlopen_self+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self=cross
@@ -141814,7 +110510,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 141817 "configure"
+#line 110513 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -141877,11 +110573,11 @@ int main ()
     exit (status);
 }
 EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -141898,15 +110594,15 @@ rm -fr conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if test "${lt_cv_dlopen_self_static+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self_static=cross
@@ -141914,7 +110610,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 141917 "configure"
+#line 110613 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -141977,11 +110673,11 @@ int main ()
     exit (status);
 }
 EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -141998,8 +110694,8 @@ rm -fr conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS="$save_CPPFLAGS"
@@ -142021,13 +110717,13 @@ fi
 
 
 # Report which library types will actually be built
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -142047,15 +110743,15 @@ aix[4-9]*)
   fi
     ;;
 esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
 # The else clause should only fire when bootstrapping the
 # libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -142148,9 +110844,9 @@ if test -f "$ltmain"; then
 cfgfile="${ofile}T"
   trap "$rm \"$cfgfile\"; exit 1" 1 2 15
   $rm -f "$cfgfile"
-  { echo "$as_me:$LINENO: result:
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result:
 creating $ofile" >&5
-echo "${ECHO_T}
+$as_echo "
 creating $ofile" >&6; }
 
   cat <<__EOF__ >> "$cfgfile"
@@ -142556,25 +111252,25 @@ CC="$lt_save_CC"
 
 
 # Check whether --with-tags was given.
-if test "${with_tags+set}" = set; then
+if test "${with_tags+set}" = set; then :
   withval=$with_tags; tagnames="$withval"
 fi
 
 
 if test -f "$ltmain" && test -n "$tagnames"; then
   if test ! -f "${ofile}"; then
-    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: output file \`$ofile' does not exist" >&5
+$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
   fi
 
   if test -z "$LTCC"; then
     eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
     if test -z "$LTCC"; then
-      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: output file \`$ofile' does not look like a libtool script" >&5
+$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
     else
-      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
+$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
     fi
   fi
   if test -z "$LTCFLAGS"; then
@@ -142591,17 +111287,13 @@ echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
     # Check whether tagname contains only valid characters
     case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
     "") ;;
-    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-echo "$as_me: error: invalid tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
+    *)  as_fn_error "invalid tag name: $tagname" "$LINENO" 5
 	;;
     esac
 
     if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
     then
-      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "tag name \"$tagname\" already exists" "$LINENO" 5
     fi
 
     # Update the list of available tags.
@@ -142735,7 +111427,7 @@ if test "$GXX" = yes; then
 
 
 # Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
+if test "${with_gnu_ld+set}" = set; then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
@@ -142744,8 +111436,8 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -142774,14 +111466,14 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "${lt_cv_path_LD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -142811,19 +111503,17 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
@@ -142835,8 +111525,8 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -142886,8 +111576,8 @@ else
 fi
 
 # PORTME: fill in a description of your system's C++ link characteristics
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 ld_shlibs_CXX=yes
 case $host_os in
   aix3*)
@@ -142985,16 +111675,16 @@ case $host_os in
       # Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 142988 "configure"
+#line 111678 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -143028,16 +111718,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	# Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 143031 "configure"
+#line 111721 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -143784,8 +112474,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ld_shlibs_CXX=no
     ;;
 esac
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 GCC_CXX="$GXX"
@@ -143805,11 +112495,11 @@ private:
 };
 EOF
 
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   # Parse the compiler output and extract the necessary
   # objects, libraries and library flags.
 
@@ -143964,8 +112654,8 @@ lt_prog_compiler_wl_CXX=
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -144254,18 +112944,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_CXX"; then
 
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works_CXX=no
   ac_outfile=conftest.$ac_objext
@@ -144280,11 +112970,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:144283: $lt_compile\"" >&5)
+   (eval echo "\"configure:112973: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "configure:144287: \$? = $ac_status" >&5
+   echo "configure:112977: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -144297,8 +112987,8 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
     case $lt_prog_compiler_pic_CXX in
@@ -144325,10 +113015,10 @@ esac
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
@@ -144353,8 +113043,8 @@ else
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
     :
@@ -144363,10 +113053,10 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_CXX=no
    $rm -r conftest 2>/dev/null
@@ -144384,11 +113074,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:144387: $lt_compile\"" >&5)
+   (eval echo "\"configure:113077: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "configure:144391: \$? = $ac_status" >&5
+   echo "configure:113081: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -144410,34 +113100,34 @@ else
    $rm conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
@@ -144462,8 +113152,8 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   esac
   exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
 test "$ld_shlibs_CXX" = no && can_build_shared=no
 
 #
@@ -144483,16 +113173,16 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $rm conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
         soname=conftest
         lib=conftest
         libobjs=conftest.$ac_objext
@@ -144506,11 +113196,11 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         libname=conftest
         lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
         allow_undefined_flag_CXX=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
         then
 	  archive_cmds_need_lc_CXX=no
         else
@@ -144521,16 +113211,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -145079,19 +113769,19 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
 fi
 
 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 fi
@@ -145103,14 +113793,14 @@ if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" || \
    test -n "$runpath_var_CXX" || \
    test "X$hardcode_automatic_CXX" = "Xyes" ; then
 
-  # We can hardcode non-existant directories.
+  # We can hardcode non-existent directories.
   if test "$hardcode_direct_CXX" != no &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library
@@ -145128,8 +113818,8 @@ else
   # directories.
   hardcode_action_CXX=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
 
 if test "$hardcode_action_CXX" = relink; then
   # Fast installation is not supported
@@ -145578,9 +114268,7 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
 	;;
 
       *)
-	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
+	as_fn_error "Unsupported tag name: $tagname" "$LINENO" 5
 	;;
       esac
 
@@ -145598,9 +114286,7 @@ echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
     chmod +x "$ofile"
   else
     rm -f "${ofile}T"
-    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "unable to update list of available tagged configurations." "$LINENO" 5
   fi
 fi
 
@@ -145649,10 +114335,10 @@ SHARED_LIBTOOL='$(LIBTOOL)'
 CC=$old_CC
 
 
-  { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-  { echo "$as_me:$LINENO: result: ${T_MD}Generating files${T_ME}" >&5
-echo "${ECHO_T}${T_MD}Generating files${T_ME}" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Generating files${T_ME}" >&5
+$as_echo "${T_MD}Generating files${T_ME}" >&6; }
 
 
 CXXFLAGS_CLEAN=$CXXFLAGS
@@ -146143,9 +114829,7 @@ EOF
 
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_BUILD_DEFS_H 1
-_ACEOF
+$as_echo "#define HAVE_BUILD_DEFS_H 1" >>confdefs.h
 
 
 $php_shtool mkdir -p pear/scripts
@@ -146240,12 +114924,13 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$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) ;; #(
-      *) $as_unset $ac_var ;;
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -146253,8 +114938,8 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -146277,12 +114962,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$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;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$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
@@ -146298,11 +114983,11 @@ ac_ltlibobjs=
 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=`echo "$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.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -146311,11 +114996,13 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $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
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -146325,59 +115012,79 @@ cat >$CONFIG_STATUS <<_ACEOF
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # 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
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+as_nl='
+'
+export as_nl
+# 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 test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 
@@ -146386,20 +115093,18 @@ fi
 # 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.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -146410,32 +115115,111 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# 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.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+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 :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# 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 :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
 
-# Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -146449,13 +115233,17 @@ else
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -146470,104 +115258,103 @@ echo X/"$0" |
 	  }
 	  s/.*/./; q'`
 
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -146584,12 +115371,12 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
-	case $1 in
-        -*)set "./$1";;
+	case $1 in #(
+	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -146604,13 +115391,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -146623,7 +115416,16 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -146631,22 +115433,25 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -146657,26 +115462,27 @@ $config_headers
 Configuration commands:
 $config_commands
 
-Report bugs to <bug-autoconf@gnu.org>."
+Report bugs to the package provider."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
+  with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -146698,34 +115504,40 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
+    as_fn_error "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
   --help | --hel | -h )
-    echo "$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=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
+  -*) as_fn_error "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
-  *) ac_config_targets="$ac_config_targets $1"
+  *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
 
   esac
@@ -146740,27 +115552,29 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
@@ -146827,7 +115641,7 @@ cat <<X
 | see the file debug.log for error messages.                         |
 |                                                                    |
 | If you are unable to fix this, send the file debug.log to the      |
-| php-install@lists.php.net mailing list and include appropiate      |
+| php-install@lists.php.net mailing list and include appropriate      |
 | information about your setup.                                      |
 X
   fi
@@ -146906,7 +115720,7 @@ fi
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -146916,9 +115730,7 @@ do
     "$ALL_OUTPUT_FILES") CONFIG_FILES="$CONFIG_FILES $ALL_OUTPUT_FILES" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -146945,7 +115757,7 @@ $debug ||
   trap 'exit_status=$?
   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
+  trap 'as_fn_exit 1' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
@@ -146956,253 +115768,140 @@ $debug ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
-
-
 
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-SED!$SED$ac_delim
-CONFIGURE_COMMAND!$CONFIGURE_COMMAND$ac_delim
-CONFIGURE_OPTIONS!$CONFIGURE_OPTIONS$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-target!$target$ac_delim
-target_cpu!$target_cpu$ac_delim
-target_vendor!$target_vendor$ac_delim
-target_os!$target_os$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-CPP!$CPP$ac_delim
-LN_S!$LN_S$ac_delim
-AWK!$AWK$ac_delim
-YACC!$YACC$ac_delim
-YFLAGS!$YFLAGS$ac_delim
-RE2C!$RE2C$ac_delim
-SHLIB_SUFFIX_NAME!$SHLIB_SUFFIX_NAME$ac_delim
-SHLIB_DL_SUFFIX_NAME!$SHLIB_DL_SUFFIX_NAME$ac_delim
-php_fpm_user!$php_fpm_user$ac_delim
-php_fpm_group!$php_fpm_group$ac_delim
-php_fpm_sysconfdir!$php_fpm_sysconfdir$ac_delim
-php_fpm_localstatedir!$php_fpm_localstatedir$ac_delim
-php_fpm_prefix!$php_fpm_prefix$ac_delim
-PROG_SENDMAIL!$PROG_SENDMAIL$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-ALLOCA!$ALLOCA$ac_delim
-LTP!$LTP$ac_delim
-LTP_GENHTML!$LTP_GENHTML$ac_delim
-KRB5_CONFIG!$KRB5_CONFIG$ac_delim
-PKG_CONFIG!$PKG_CONFIG$ac_delim
-OPENSSL_INCDIR_OPT!$OPENSSL_INCDIR_OPT$ac_delim
-ICU_CONFIG!$ICU_CONFIG$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-CXXCPP!$CXXCPP$ac_delim
-MYSQL_MODULE_TYPE!$MYSQL_MODULE_TYPE$ac_delim
-MYSQL_LIBS!$MYSQL_LIBS$ac_delim
-MYSQL_INCLUDE!$MYSQL_INCLUDE$ac_delim
-OCI8_SHARED_LIBADD!$OCI8_SHARED_LIBADD$ac_delim
-OCI8_DIR!$OCI8_DIR$ac_delim
-OCI8_ORACLE_VERSION!$OCI8_ORACLE_VERSION$ac_delim
-ODBC_INCLUDE!$ODBC_INCLUDE$ac_delim
-ODBC_LIBS!$ODBC_LIBS$ac_delim
-ODBC_LFLAGS!$ODBC_LFLAGS$ac_delim
-ODBC_TYPE!$ODBC_TYPE$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\r'
+else
+  ac_cs_awk_cr=$ac_cr
 fi
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-PDO_MYSQL_MODULE_TYPE!$PDO_MYSQL_MODULE_TYPE$ac_delim
-PDO_OCI_SHARED_LIBADD!$PDO_OCI_SHARED_LIBADD$ac_delim
-PDO_OCI_DIR!$PDO_OCI_DIR$ac_delim
-PDO_OCI_VERSION!$PDO_OCI_VERSION$ac_delim
-SNMP_CONFIG!$SNMP_CONFIG$ac_delim
-RANLIB!$RANLIB$ac_delim
-INLINE_CFLAGS!$INLINE_CFLAGS$ac_delim
-INCLUDE_PATH!$INCLUDE_PATH$ac_delim
-EXPANDED_PEAR_INSTALLDIR!$EXPANDED_PEAR_INSTALLDIR$ac_delim
-EXPANDED_EXTENSION_DIR!$EXPANDED_EXTENSION_DIR$ac_delim
-EXPANDED_BINDIR!$EXPANDED_BINDIR$ac_delim
-EXPANDED_SBINDIR!$EXPANDED_SBINDIR$ac_delim
-EXPANDED_MANDIR!$EXPANDED_MANDIR$ac_delim
-EXPANDED_LIBDIR!$EXPANDED_LIBDIR$ac_delim
-EXPANDED_DATADIR!$EXPANDED_DATADIR$ac_delim
-EXPANDED_SYSCONFDIR!$EXPANDED_SYSCONFDIR$ac_delim
-EXPANDED_LOCALSTATEDIR!$EXPANDED_LOCALSTATEDIR$ac_delim
-EXPANDED_PHP_CONFIG_FILE_PATH!$EXPANDED_PHP_CONFIG_FILE_PATH$ac_delim
-EXPANDED_PHP_CONFIG_FILE_SCAN_DIR!$EXPANDED_PHP_CONFIG_FILE_SCAN_DIR$ac_delim
-PHP_INSTALLED_SAPIS!$PHP_INSTALLED_SAPIS$ac_delim
-abs_builddir!$abs_builddir$ac_delim
-abs_srcdir!$abs_srcdir$ac_delim
-php_abs_top_builddir!$php_abs_top_builddir$ac_delim
-php_abs_top_srcdir!$php_abs_top_srcdir$ac_delim
-program_prefix!$program_prefix$ac_delim
-program_suffix!$program_suffix$ac_delim
-DEBUG_CFLAGS!$DEBUG_CFLAGS$ac_delim
-EXTENSION_DIR!$EXTENSION_DIR$ac_delim
-EXTRA_LDFLAGS!$EXTRA_LDFLAGS$ac_delim
-EXTRA_LDFLAGS_PROGRAM!$EXTRA_LDFLAGS_PROGRAM$ac_delim
-EXTRA_LIBS!$EXTRA_LIBS$ac_delim
-ZEND_EXTRA_LIBS!$ZEND_EXTRA_LIBS$ac_delim
-INCLUDES!$INCLUDES$ac_delim
-EXTRA_INCLUDES!$EXTRA_INCLUDES$ac_delim
-INSTALL_IT!$INSTALL_IT$ac_delim
-NATIVE_RPATHS!$NATIVE_RPATHS$ac_delim
-PEAR_INSTALLDIR!$PEAR_INSTALLDIR$ac_delim
-PHP_LDFLAGS!$PHP_LDFLAGS$ac_delim
-PHP_LIBS!$PHP_LIBS$ac_delim
-PHP_VERSION!$PHP_VERSION$ac_delim
-PHP_VERSION_ID!$PHP_VERSION_ID$ac_delim
-ECHO!$ECHO$ac_delim
-AR!$AR$ac_delim
-STRIP!$STRIP$ac_delim
-DSYMUTIL!$DSYMUTIL$ac_delim
-NMEDIT!$NMEDIT$ac_delim
-LIBTOOL!$LIBTOOL$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 48; then
+  . ./conf$$subs.sh ||
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+  print line
+}
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACAWK
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -147218,20 +115917,128 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
 
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-   { (exit 1); exit 1; }; };;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -147259,26 +116066,34 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    fi
+      { $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=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -147288,42 +116103,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -147341,20 +116121,15 @@ echo X"$as_dir" |
 	    q
 	  }
 	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
+  as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$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=`echo "$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/ ;;
@@ -147390,12 +116165,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
-
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -147403,36 +116178,37 @@ case `sed -n '/datarootdir/ {
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$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
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
   s&@infodir@&$infodir&g
   s&@localedir@&$localedir&g
   s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
+  s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -147441,134 +116217,65 @@ s&@builddir@&$ac_builddir&;t t
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$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
-echo "$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 "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $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 "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error "could not create -" "$LINENO" 5
   fi
-  rm -f "$tmp/out12"
  ;;
 
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
 done # for ac_tag
 
 
-{ (exit 0); exit 0; }
+as_fn_exit 0
 _ACEOF
-chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -147588,7 +116295,11 @@ if test "$no_create" != yes; then
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
+  $ac_cs_success || as_fn_exit $?
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $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
 
 
diff --git a/configure.in b/configure.in
index dbaeae03d..de62fe013 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=4
-PHP_RELEASE_VERSION=15
+PHP_RELEASE_VERSION=21
 PHP_EXTRA_VERSION=""
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
@@ -1582,7 +1582,7 @@ cat <<X
 | see the file debug.log for error messages.                         |
 |                                                                    |
 | If you are unable to fix this, send the file debug.log to the      |
-| php-install@lists.php.net mailing list and include appropiate      |
+| php-install@lists.php.net mailing list and include appropriate      |
 | information about your setup.                                      |
 X
   fi
diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c
index 65b06d79f..abe84fc31 100644
--- a/ext/bz2/bz2.c
+++ b/ext/bz2/bz2.c
@@ -518,7 +518,7 @@ static PHP_FUNCTION(bzcompress)
 		efree(dest);
 		RETURN_LONG(error);
 	} else {
-		/* Copy the buffer, we have perhaps allocate alot more than we need,
+		/* Copy the buffer, we have perhaps allocate a lot more than we need,
 		   so we erealloc() the buffer to the proper size */
 		dest = erealloc(dest, dest_len + 1);
 		dest[dest_len] = 0;
diff --git a/ext/bz2/tests/bug51997.phpt b/ext/bz2/tests/bug51997.phpt
index fea539894..c53deacc5 100644
--- a/ext/bz2/tests/bug51997.phpt
+++ b/ext/bz2/tests/bug51997.phpt
@@ -7,7 +7,7 @@ Bug #51997 (SEEK_CUR with 0 value, returns a warning)
 
 error_reporting(E_ALL);
 
-$filename = "testfile.bz2";
+$filename = "bug51997.bz2";
 $str = "This is a test string.\n";
 $bz = bzopen($filename, "w");
 bzwrite($bz, $str);
diff --git a/ext/bz2/tests/with_files.phpt b/ext/bz2/tests/with_files.phpt
index 569144593..3763398a1 100644
--- a/ext/bz2/tests/with_files.phpt
+++ b/ext/bz2/tests/with_files.phpt
@@ -7,7 +7,7 @@ BZ2 with files
 
 error_reporting(E_ALL);
 
-$filename = "testfile.bz2";
+$filename = "with_files.bz2";
 $str = "This is a test string.\n";
 $bz = bzopen($filename, "w");
 bzwrite($bz, $str);
diff --git a/ext/calendar/jewish.c b/ext/calendar/jewish.c
index f4dc7c35a..fcc0e5c0b 100644
--- a/ext/calendar/jewish.c
+++ b/ext/calendar/jewish.c
@@ -272,6 +272,7 @@
 #define HALAKIM_PER_METONIC_CYCLE (HALAKIM_PER_LUNAR_CYCLE * (12 * 19 + 7))
 
 #define JEWISH_SDN_OFFSET 347997
+#define JEWISH_SDN_MAX 324542846L /* 12/13/887605, greater value raises interger overflow */
 #define NEW_MOON_OF_CREATION 31524
 
 #define SUNDAY    0
@@ -519,7 +520,7 @@ void SdnToJewish(
 	int tishri1After;
 	int yearLength;
 
-	if (sdn <= JEWISH_SDN_OFFSET) {
+	if (sdn <= JEWISH_SDN_OFFSET || sdn > JEWISH_SDN_MAX) {
 		*pYear = 0;
 		*pMonth = 0;
 		*pDay = 0;
diff --git a/ext/calendar/tests/jdtojewish64.phpt b/ext/calendar/tests/jdtojewish64.phpt
new file mode 100644
index 000000000..9f01109a7
--- /dev/null
+++ b/ext/calendar/tests/jdtojewish64.phpt
@@ -0,0 +1,19 @@
+--TEST--
+Bug #64895: Integer overflow in SndToJewish
+--SKIPIF--
+<?php 
+include 'skipif.inc';
+if (PHP_INT_SIZE == 4) {
+        die("skip this test is for 64bit platform only");
+}
+?>
+--FILE--
+<?php
+$a = array(38245310, 324542846, 324542847, 9223372036854743639);
+
+foreach ($a as $x) var_dump(jdtojewish($x));
+--EXPECTF--
+string(11) "2/22/103759"
+string(12) "12/13/887605"
+string(5) "0/0/0"
+string(5) "0/0/0"
diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c
index 853b7df4c..556f356b9 100644
--- a/ext/com_dotnet/com_variant.c
+++ b/ext/com_dotnet/com_variant.c
@@ -102,8 +102,9 @@ PHP_COM_DOTNET_API void php_com_variant_from_zval(VARIANT *v, zval *z, int codep
 {
 	OLECHAR *olestring;
 	php_com_dotnet_object *obj;
+	zend_uchar ztype = (z == NULL ? IS_NULL : Z_TYPE_P(z));
 	
-	switch (Z_TYPE_P(z)) {
+	switch (ztype) {
 		case IS_NULL:
 			V_VT(v) = VT_NULL;
 			break;
@@ -429,7 +430,7 @@ PHP_FUNCTION(com_variant_create_instance)
 		/* If already an array and VT_ARRAY is passed then:
 			- if only VT_ARRAY passed then do not perform a conversion
 			- if VT_ARRAY plus other type passed then perform conversion 
-			  but will probably fail (origional behavior)
+			  but will probably fail (original behavior)
 		*/
 		if ((vt & VT_ARRAY) && (V_VT(&obj->v) & VT_ARRAY)) {
 			long orig_vt = vt;
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 531f15ba1..d122051ad 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1068,7 +1068,6 @@ static size_t curl_progress(void *clientp, double dltotal, double dlnow, double
 {
 	php_curl       *ch = (php_curl *) clientp;
 	php_curl_progress  *t  = ch->handlers->progress;
-	int             length = -1;
 	size_t	rval = 0;
 
 #if PHP_CURL_DEBUG
@@ -1118,7 +1117,6 @@ static size_t curl_progress(void *clientp, double dltotal, double dlnow, double
 			ch->in_callback = 0;
 			if (error == FAILURE) {
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot call the CURLOPT_PROGRESSFUNCTION");
-				length = -1;
 			} else if (retval_ptr) {
 				if (Z_TYPE_P(retval_ptr) != IS_LONG) {
 					convert_to_long_ex(&retval_ptr);
@@ -1373,9 +1371,9 @@ static void curl_free_post(void **post)
 
 /* {{{ curl_free_slist
  */
-static void curl_free_slist(void **slist)
+static void curl_free_slist(void *slist)
 {
-	curl_slist_free_all((struct curl_slist *) *slist);
+	curl_slist_free_all(*((struct curl_slist **) slist));
 }
 /* }}} */
 
@@ -1443,8 +1441,10 @@ static void alloc_curl_handle(php_curl **ch)
 	(*ch)->handlers->read->stream = NULL;
 
 	zend_llist_init(&(*ch)->to_free->str,   sizeof(char *),            (llist_dtor_func_t) curl_free_string, 0);
-	zend_llist_init(&(*ch)->to_free->slist, sizeof(struct curl_slist), (llist_dtor_func_t) curl_free_slist,  0);
 	zend_llist_init(&(*ch)->to_free->post,  sizeof(struct HttpPost),   (llist_dtor_func_t) curl_free_post,   0);
+
+	(*ch)->to_free->slist = emalloc(sizeof(HashTable));
+	zend_hash_init((*ch)->to_free->slist, 4, NULL, curl_free_slist, 0);
 }
 /* }}} */
 
@@ -1675,6 +1675,7 @@ PHP_FUNCTION(curl_copy_handle)
 	curl_easy_setopt(dupch->cp, CURLOPT_WRITEHEADER,       (void *) dupch);
 	curl_easy_setopt(dupch->cp, CURLOPT_PROGRESSDATA,      (void *) dupch); 
 
+	efree(dupch->to_free->slist);
 	efree(dupch->to_free);
 	dupch->to_free = ch->to_free;
 
@@ -2184,7 +2185,7 @@ string_copy:
 					return 1;
 				}
 			}
-			zend_llist_add_element(&ch->to_free->slist, &slist);
+			zend_hash_index_update(ch->to_free->slist, (ulong) option, &slist, sizeof(struct curl_slist *), NULL);
 
 			error = curl_easy_setopt(ch->cp, option, slist);
 
@@ -2680,8 +2681,9 @@ static void _php_curl_close_ex(php_curl *ch TSRMLS_DC)
 	/* cURL destructors should be invoked only by last curl handle */
 	if (Z_REFCOUNT_P(ch->clone) <= 1) {
 		zend_llist_clean(&ch->to_free->str);
-		zend_llist_clean(&ch->to_free->slist);
 		zend_llist_clean(&ch->to_free->post);
+		zend_hash_destroy(ch->to_free->slist);
+		efree(ch->to_free->slist);
 		efree(ch->to_free);
 		FREE_ZVAL(ch->clone);
 	} else {
diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h
index 945f0a430..911d87a6b 100644
--- a/ext/curl/php_curl.h
+++ b/ext/curl/php_curl.h
@@ -126,7 +126,7 @@ struct _php_curl_send_headers {
 struct _php_curl_free {
 	zend_llist str;
 	zend_llist post;
-	zend_llist slist;
+	HashTable *slist;
 };
 
 typedef struct {
diff --git a/ext/curl/tests/bug65458.phpt b/ext/curl/tests/bug65458.phpt
new file mode 100644
index 000000000..99288f24b
--- /dev/null
+++ b/ext/curl/tests/bug65458.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Bug #65458 (curl memory leak)
+--SKIPIF--
+<?php
+if (!extension_loaded('curl')) exit("skip curl extension not loaded");
+?>
+--FILE--
+<?php
+$ch = curl_init();
+$init = memory_get_usage();
+for ($i = 0; $i < 10000; $i++) {
+    curl_setopt($ch, CURLOPT_HTTPHEADER, [ "SOAPAction: getItems" ]);
+}
+
+$preclose = memory_get_usage();
+curl_close($ch);
+
+// This is a slightly tricky heuristic, but basically, we want to ensure
+// $preclose - $init has a delta in the order of bytes, not megabytes. Given
+// the number of iterations in the loop, if we're wasting memory here, we
+// should have megs and megs of extra allocations.
+var_dump(($preclose - $init) < 10000);
+?>
+--EXPECT--
+bool(true)
diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
index 0421e2172..f85a99dc6 100644
--- a/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sun Sep 30 20:14:42 2012 */
+/* Generated by re2c 0.13.5 on Sun Aug 25 14:46:08 2013 */
 /*
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
@@ -650,7 +650,8 @@ static const timelib_relunit* timelib_lookup_relunit(char **ptr)
 	char *begin = *ptr, *end;
 	const timelib_relunit *tp, *value = NULL;
 
-	while (**ptr != '\0' && **ptr != ' ' && **ptr != ',' && **ptr != '\t') {
+	while (**ptr != '\0' && **ptr != ' ' && **ptr != ',' && **ptr != '\t' && **ptr != ';' && **ptr != ':' &&
+           **ptr != '/' && **ptr != '.' && **ptr != '-' && **ptr != '(' && **ptr != ')' ) {
 		++*ptr;
 	}
 	end = *ptr;
@@ -24937,7 +24938,7 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim
 					TIMELIB_CHECK_NUMBER;
 					sec = timelib_get_nr_ex((char **) &ptr, 2, &length);
 					if (sec == TIMELIB_UNSET || length != 2) {
-						add_pbf_error(s, "A two second minute could not be found", string, begin);
+						add_pbf_error(s, "A two digit second could not be found", string, begin);
 					} else {
 						s->time->s = sec;
 					}
@@ -25025,7 +25026,7 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim
 				break;
 
 			case '\\': /* escaped char */
-				*fptr++;
+				fptr++;
 				if (*ptr == *fptr) {
 					++ptr;
 				} else {
diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re
index 8e1972d99..df33508f5 100644
--- a/ext/date/lib/parse_date.re
+++ b/ext/date/lib/parse_date.re
@@ -649,7 +649,8 @@ static const timelib_relunit* timelib_lookup_relunit(char **ptr)
 	char *begin = *ptr, *end;
 	const timelib_relunit *tp, *value = NULL;
 
-	while (**ptr != '\0' && **ptr != ' ' && **ptr != ',' && **ptr != '\t') {
+	while (**ptr != '\0' && **ptr != ' ' && **ptr != ',' && **ptr != '\t' && **ptr != ';' && **ptr != ':' &&
+           **ptr != '/' && **ptr != '.' && **ptr != '-' && **ptr != '(' && **ptr != ')' ) {
 		++*ptr;
 	}
 	end = *ptr;
@@ -2042,7 +2043,7 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim
 					TIMELIB_CHECK_NUMBER;
 					sec = timelib_get_nr_ex((char **) &ptr, 2, &length);
 					if (sec == TIMELIB_UNSET || length != 2) {
-						add_pbf_error(s, "A two second minute could not be found", string, begin);
+						add_pbf_error(s, "A two digit second could not be found", string, begin);
 					} else {
 						s->time->s = sec;
 					}
@@ -2130,7 +2131,7 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim
 				break;
 
 			case '\\': /* escaped char */
-				*fptr++;
+				fptr++;
 				if (*ptr == *fptr) {
 					++ptr;
 				} else {
diff --git a/ext/date/lib/timezonedb.h b/ext/date/lib/timezonedb.h
index 2f9d8fe66..8142aab56 100644
--- a/ext/date/lib/timezonedb.h
+++ b/ext/date/lib/timezonedb.h
@@ -58,529 +58,529 @@ const timelib_tzdb_index_entry timezonedb_idx_builtin[579] = {
 	{ "America/Anguilla"                  , 0x002952 },
 	{ "America/Antigua"                   , 0x0029A7 },
 	{ "America/Araguaina"                 , 0x002A0D },
-	{ "America/Argentina/Buenos_Aires"    , 0x002C67 },
-	{ "America/Argentina/Catamarca"       , 0x002E15 },
-	{ "America/Argentina/ComodRivadavia"  , 0x002FD6 },
-	{ "America/Argentina/Cordoba"         , 0x00317C },
-	{ "America/Argentina/Jujuy"           , 0x003351 },
-	{ "America/Argentina/La_Rioja"        , 0x003505 },
-	{ "America/Argentina/Mendoza"         , 0x0036BD },
-	{ "America/Argentina/Rio_Gallegos"    , 0x00387D },
-	{ "America/Argentina/Salta"           , 0x003A32 },
-	{ "America/Argentina/San_Juan"        , 0x003BDE },
-	{ "America/Argentina/San_Luis"        , 0x003D96 },
-	{ "America/Argentina/Tucuman"         , 0x003F5C },
-	{ "America/Argentina/Ushuaia"         , 0x004118 },
-	{ "America/Aruba"                     , 0x0042D3 },
-	{ "America/Asuncion"                  , 0x004339 },
-	{ "America/Atikokan"                  , 0x00461E },
-	{ "America/Atka"                      , 0x0046F4 },
-	{ "America/Bahia"                     , 0x004A5A },
-	{ "America/Bahia_Banderas"            , 0x004BED },
-	{ "America/Barbados"                  , 0x004E66 },
-	{ "America/Belem"                     , 0x004F00 },
-	{ "America/Belize"                    , 0x004FFB },
-	{ "America/Blanc-Sablon"              , 0x005177 },
-	{ "America/Boa_Vista"                 , 0x00522B },
-	{ "America/Bogota"                    , 0x005334 },
-	{ "America/Boise"                     , 0x0053A0 },
-	{ "America/Buenos_Aires"              , 0x005737 },
-	{ "America/Cambridge_Bay"             , 0x0058D0 },
-	{ "America/Campo_Grande"              , 0x005BF8 },
-	{ "America/Cancun"                    , 0x005EE7 },
-	{ "America/Caracas"                   , 0x006129 },
-	{ "America/Catamarca"                 , 0x006190 },
-	{ "America/Cayenne"                   , 0x006336 },
-	{ "America/Cayman"                    , 0x006398 },
-	{ "America/Chicago"                   , 0x0063ED },
-	{ "America/Chihuahua"                 , 0x006904 },
-	{ "America/Coral_Harbour"             , 0x006B6F },
-	{ "America/Cordoba"                   , 0x006C01 },
-	{ "America/Costa_Rica"                , 0x006DA7 },
-	{ "America/Creston"                   , 0x006E31 },
-	{ "America/Cuiaba"                    , 0x006EBD },
-	{ "America/Curacao"                   , 0x00719B },
-	{ "America/Danmarkshavn"              , 0x007201 },
-	{ "America/Dawson"                    , 0x007345 },
-	{ "America/Dawson_Creek"              , 0x007662 },
-	{ "America/Denver"                    , 0x00783C },
-	{ "America/Detroit"                   , 0x007BC2 },
-	{ "America/Dominica"                  , 0x007F21 },
-	{ "America/Edmonton"                  , 0x007F76 },
-	{ "America/Eirunepe"                  , 0x00832E },
-	{ "America/El_Salvador"               , 0x008441 },
-	{ "America/Ensenada"                  , 0x0084B6 },
-	{ "America/Fort_Wayne"                , 0x00895D },
-	{ "America/Fortaleza"                 , 0x00881F },
-	{ "America/Glace_Bay"                 , 0x008BC7 },
-	{ "America/Godthab"                   , 0x008F3E },
-	{ "America/Goose_Bay"                 , 0x009202 },
-	{ "America/Grand_Turk"                , 0x0096BF },
-	{ "America/Grenada"                   , 0x00996E },
-	{ "America/Guadeloupe"                , 0x0099C3 },
-	{ "America/Guatemala"                 , 0x009A18 },
-	{ "America/Guayaquil"                 , 0x009AA1 },
-	{ "America/Guyana"                    , 0x009AFE },
-	{ "America/Halifax"                   , 0x009B7F },
-	{ "America/Havana"                    , 0x00A095 },
-	{ "America/Hermosillo"                , 0x00A408 },
-	{ "America/Indiana/Indianapolis"      , 0x00A4E6 },
-	{ "America/Indiana/Knox"              , 0x00A777 },
-	{ "America/Indiana/Marengo"           , 0x00AB0E },
-	{ "America/Indiana/Petersburg"        , 0x00ADB4 },
-	{ "America/Indiana/Tell_City"         , 0x00B301 },
-	{ "America/Indiana/Vevay"             , 0x00B59A },
-	{ "America/Indiana/Vincennes"         , 0x00B7D5 },
-	{ "America/Indiana/Winamac"           , 0x00BA89 },
-	{ "America/Indianapolis"              , 0x00B097 },
-	{ "America/Inuvik"                    , 0x00BD42 },
-	{ "America/Iqaluit"                   , 0x00C039 },
-	{ "America/Jamaica"                   , 0x00C35B },
-	{ "America/Jujuy"                     , 0x00C420 },
-	{ "America/Juneau"                    , 0x00C5CA },
-	{ "America/Kentucky/Louisville"       , 0x00C948 },
-	{ "America/Kentucky/Monticello"       , 0x00CD66 },
-	{ "America/Knox_IN"                   , 0x00D0EB },
-	{ "America/Kralendijk"                , 0x00D45C },
-	{ "America/La_Paz"                    , 0x00D4C2 },
-	{ "America/Lima"                      , 0x00D529 },
-	{ "America/Los_Angeles"               , 0x00D5D1 },
-	{ "America/Louisville"                , 0x00D9E2 },
-	{ "America/Lower_Princes"             , 0x00DDD7 },
-	{ "America/Maceio"                    , 0x00DE3D },
-	{ "America/Managua"                   , 0x00DF77 },
-	{ "America/Manaus"                    , 0x00E02A },
-	{ "America/Marigot"                   , 0x00E12C },
-	{ "America/Martinique"                , 0x00E181 },
-	{ "America/Matamoros"                 , 0x00E1ED },
-	{ "America/Mazatlan"                  , 0x00E446 },
-	{ "America/Mendoza"                   , 0x00E6B3 },
-	{ "America/Menominee"                 , 0x00E867 },
-	{ "America/Merida"                    , 0x00EBE8 },
-	{ "America/Metlakatla"                , 0x00EE23 },
-	{ "America/Mexico_City"               , 0x00EF5D },
-	{ "America/Miquelon"                  , 0x00F1D8 },
-	{ "America/Moncton"                   , 0x00F44A },
-	{ "America/Monterrey"                 , 0x00F8E1 },
-	{ "America/Montevideo"                , 0x00FB44 },
-	{ "America/Montreal"                  , 0x00FE56 },
-	{ "America/Montserrat"                , 0x01036C },
-	{ "America/Nassau"                    , 0x0103C1 },
-	{ "America/New_York"                  , 0x010706 },
-	{ "America/Nipigon"                   , 0x010C11 },
-	{ "America/Nome"                      , 0x010F62 },
-	{ "America/Noronha"                   , 0x0112E0 },
-	{ "America/North_Dakota/Beulah"       , 0x011410 },
-	{ "America/North_Dakota/Center"       , 0x0117A4 },
-	{ "America/North_Dakota/New_Salem"    , 0x011B38 },
-	{ "America/Ojinaga"                   , 0x011EE1 },
-	{ "America/Panama"                    , 0x012142 },
-	{ "America/Pangnirtung"               , 0x012197 },
-	{ "America/Paramaribo"                , 0x0124CD },
-	{ "America/Phoenix"                   , 0x01255F },
-	{ "America/Port-au-Prince"            , 0x01260D },
-	{ "America/Port_of_Spain"             , 0x01292C },
-	{ "America/Porto_Acre"                , 0x01282D },
-	{ "America/Porto_Velho"               , 0x012981 },
-	{ "America/Puerto_Rico"               , 0x012A77 },
-	{ "America/Rainy_River"               , 0x012AE2 },
-	{ "America/Rankin_Inlet"              , 0x012E1A },
-	{ "America/Recife"                    , 0x013100 },
-	{ "America/Regina"                    , 0x01322A },
-	{ "America/Resolute"                  , 0x0133E8 },
-	{ "America/Rio_Branco"                , 0x0136D9 },
-	{ "America/Rosario"                   , 0x0137DC },
-	{ "America/Santa_Isabel"              , 0x013982 },
-	{ "America/Santarem"                  , 0x013D25 },
-	{ "America/Santiago"                  , 0x013E2A },
-	{ "America/Santo_Domingo"             , 0x0141D3 },
-	{ "America/Sao_Paulo"                 , 0x014299 },
-	{ "America/Scoresbysund"              , 0x0145A8 },
-	{ "America/Shiprock"                  , 0x014896 },
-	{ "America/Sitka"                     , 0x014C25 },
-	{ "America/St_Barthelemy"             , 0x014FAD },
-	{ "America/St_Johns"                  , 0x015002 },
-	{ "America/St_Kitts"                  , 0x015555 },
-	{ "America/St_Lucia"                  , 0x0155AA },
-	{ "America/St_Thomas"                 , 0x0155FF },
-	{ "America/St_Vincent"                , 0x015654 },
-	{ "America/Swift_Current"             , 0x0156A9 },
-	{ "America/Tegucigalpa"               , 0x0157CA },
-	{ "America/Thule"                     , 0x015849 },
-	{ "America/Thunder_Bay"               , 0x015A90 },
-	{ "America/Tijuana"                   , 0x015DD9 },
-	{ "America/Toronto"                   , 0x016172 },
-	{ "America/Tortola"                   , 0x016689 },
-	{ "America/Vancouver"                 , 0x0166DE },
-	{ "America/Virgin"                    , 0x016B1B },
-	{ "America/Whitehorse"                , 0x016B70 },
-	{ "America/Winnipeg"                  , 0x016E8D },
-	{ "America/Yakutat"                   , 0x0172CD },
-	{ "America/Yellowknife"               , 0x017638 },
-	{ "Antarctica/Casey"                  , 0x017948 },
-	{ "Antarctica/Davis"                  , 0x0179E5 },
-	{ "Antarctica/DumontDUrville"         , 0x017A86 },
-	{ "Antarctica/Macquarie"              , 0x017B18 },
-	{ "Antarctica/Mawson"                 , 0x017D5F },
-	{ "Antarctica/McMurdo"                , 0x017DDB },
-	{ "Antarctica/Palmer"                 , 0x0180DD },
-	{ "Antarctica/Rothera"                , 0x0183F9 },
-	{ "Antarctica/South_Pole"             , 0x01846F },
-	{ "Antarctica/Syowa"                  , 0x018777 },
-	{ "Antarctica/Vostok"                 , 0x0187E5 },
-	{ "Arctic/Longyearbyen"               , 0x018856 },
-	{ "Asia/Aden"                         , 0x018B88 },
-	{ "Asia/Almaty"                       , 0x018BDD },
-	{ "Asia/Amman"                        , 0x018D5C },
-	{ "Asia/Anadyr"                       , 0x019012 },
-	{ "Asia/Aqtau"                        , 0x0191F7 },
-	{ "Asia/Aqtobe"                       , 0x0193F6 },
-	{ "Asia/Ashgabat"                     , 0x0195AE },
-	{ "Asia/Ashkhabad"                    , 0x0196CB },
-	{ "Asia/Baghdad"                      , 0x0197E8 },
-	{ "Asia/Bahrain"                      , 0x01995D },
-	{ "Asia/Baku"                         , 0x0199C3 },
-	{ "Asia/Bangkok"                      , 0x019CAB },
-	{ "Asia/Beirut"                       , 0x019D00 },
-	{ "Asia/Bishkek"                      , 0x01A00D },
-	{ "Asia/Brunei"                       , 0x01A1B9 },
-	{ "Asia/Calcutta"                     , 0x01A21B },
-	{ "Asia/Choibalsan"                   , 0x01A294 },
-	{ "Asia/Chongqing"                    , 0x01A40D },
-	{ "Asia/Chungking"                    , 0x01A4FC },
-	{ "Asia/Colombo"                      , 0x01A5AB },
-	{ "Asia/Dacca"                        , 0x01A647 },
-	{ "Asia/Damascus"                     , 0x01A6ED },
-	{ "Asia/Dhaka"                        , 0x01AA3D },
-	{ "Asia/Dili"                         , 0x01AAE3 },
-	{ "Asia/Dubai"                        , 0x01AB6C },
-	{ "Asia/Dushanbe"                     , 0x01ABC1 },
-	{ "Asia/Gaza"                         , 0x01ACC4 },
-	{ "Asia/Harbin"                       , 0x01B017 },
-	{ "Asia/Hebron"                       , 0x01B0FE },
-	{ "Asia/Ho_Chi_Minh"                  , 0x01B45A },
-	{ "Asia/Hong_Kong"                    , 0x01B4D2 },
-	{ "Asia/Hovd"                         , 0x01B694 },
-	{ "Asia/Irkutsk"                      , 0x01B80C },
-	{ "Asia/Istanbul"                     , 0x01B9F2 },
-	{ "Asia/Jakarta"                      , 0x01BDDF },
-	{ "Asia/Jayapura"                     , 0x01BE89 },
-	{ "Asia/Jerusalem"                    , 0x01BF25 },
-	{ "Asia/Kabul"                        , 0x01C254 },
-	{ "Asia/Kamchatka"                    , 0x01C2A5 },
-	{ "Asia/Karachi"                      , 0x01C481 },
-	{ "Asia/Kashgar"                      , 0x01C536 },
-	{ "Asia/Kathmandu"                    , 0x01C607 },
-	{ "Asia/Katmandu"                     , 0x01C66D },
-	{ "Asia/Khandyga"                     , 0x01C6D3 },
-	{ "Asia/Kolkata"                      , 0x01C8F8 },
-	{ "Asia/Krasnoyarsk"                  , 0x01C971 },
-	{ "Asia/Kuala_Lumpur"                 , 0x01CB59 },
-	{ "Asia/Kuching"                      , 0x01CC16 },
-	{ "Asia/Kuwait"                       , 0x01CD04 },
-	{ "Asia/Macao"                        , 0x01CD59 },
-	{ "Asia/Macau"                        , 0x01CE94 },
-	{ "Asia/Magadan"                      , 0x01CFCF },
-	{ "Asia/Makassar"                     , 0x01D1B1 },
-	{ "Asia/Manila"                       , 0x01D275 },
-	{ "Asia/Muscat"                       , 0x01D2FA },
-	{ "Asia/Nicosia"                      , 0x01D34F },
-	{ "Asia/Novokuznetsk"                 , 0x01D637 },
-	{ "Asia/Novosibirsk"                  , 0x01D839 },
-	{ "Asia/Omsk"                         , 0x01DA24 },
-	{ "Asia/Oral"                         , 0x01DC0B },
-	{ "Asia/Phnom_Penh"                   , 0x01DDDB },
-	{ "Asia/Pontianak"                    , 0x01DE53 },
-	{ "Asia/Pyongyang"                    , 0x01DF14 },
-	{ "Asia/Qatar"                        , 0x01DF81 },
-	{ "Asia/Qyzylorda"                    , 0x01DFE7 },
-	{ "Asia/Rangoon"                      , 0x01E1BD },
-	{ "Asia/Riyadh"                       , 0x01E235 },
-	{ "Asia/Saigon"                       , 0x01E28A },
-	{ "Asia/Sakhalin"                     , 0x01E302 },
-	{ "Asia/Samarkand"                    , 0x01E4F9 },
-	{ "Asia/Seoul"                        , 0x01E62F },
-	{ "Asia/Shanghai"                     , 0x01E6D3 },
-	{ "Asia/Singapore"                    , 0x01E7B3 },
-	{ "Asia/Taipei"                       , 0x01E86A },
-	{ "Asia/Tashkent"                     , 0x01E982 },
-	{ "Asia/Tbilisi"                      , 0x01EAB3 },
-	{ "Asia/Tehran"                       , 0x01EC6D },
-	{ "Asia/Tel_Aviv"                     , 0x01EEDB },
-	{ "Asia/Thimbu"                       , 0x01F20A },
-	{ "Asia/Thimphu"                      , 0x01F270 },
-	{ "Asia/Tokyo"                        , 0x01F2D6 },
-	{ "Asia/Ujung_Pandang"                , 0x01F35F },
-	{ "Asia/Ulaanbaatar"                  , 0x01F3DB },
-	{ "Asia/Ulan_Bator"                   , 0x01F536 },
-	{ "Asia/Urumqi"                       , 0x01F683 },
-	{ "Asia/Ust-Nera"                     , 0x01F74A },
-	{ "Asia/Vientiane"                    , 0x01F94F },
-	{ "Asia/Vladivostok"                  , 0x01F9C7 },
-	{ "Asia/Yakutsk"                      , 0x01FBB3 },
-	{ "Asia/Yekaterinburg"                , 0x01FD98 },
-	{ "Asia/Yerevan"                      , 0x01FFA3 },
-	{ "Atlantic/Azores"                   , 0x0201A3 },
-	{ "Atlantic/Bermuda"                  , 0x0206A6 },
-	{ "Atlantic/Canary"                   , 0x020987 },
-	{ "Atlantic/Cape_Verde"               , 0x020C5D },
-	{ "Atlantic/Faeroe"                   , 0x020CD6 },
-	{ "Atlantic/Faroe"                    , 0x020F7A },
-	{ "Atlantic/Jan_Mayen"                , 0x02121E },
-	{ "Atlantic/Madeira"                  , 0x021550 },
-	{ "Atlantic/Reykjavik"                , 0x021A59 },
-	{ "Atlantic/South_Georgia"            , 0x021C12 },
-	{ "Atlantic/St_Helena"                , 0x021E24 },
-	{ "Atlantic/Stanley"                  , 0x021C56 },
-	{ "Australia/ACT"                     , 0x021E79 },
-	{ "Australia/Adelaide"                , 0x022196 },
-	{ "Australia/Brisbane"                , 0x0224C2 },
-	{ "Australia/Broken_Hill"             , 0x022589 },
-	{ "Australia/Canberra"                , 0x0228C7 },
-	{ "Australia/Currie"                  , 0x022BE4 },
-	{ "Australia/Darwin"                  , 0x022F17 },
-	{ "Australia/Eucla"                   , 0x022F9D },
-	{ "Australia/Hobart"                  , 0x023072 },
-	{ "Australia/LHI"                     , 0x0233D0 },
-	{ "Australia/Lindeman"                , 0x02366B },
-	{ "Australia/Lord_Howe"               , 0x02374C },
-	{ "Australia/Melbourne"               , 0x0239F7 },
-	{ "Australia/North"                   , 0x023D1C },
-	{ "Australia/NSW"                     , 0x023D90 },
-	{ "Australia/Perth"                   , 0x0240AD },
-	{ "Australia/Queensland"              , 0x024185 },
-	{ "Australia/South"                   , 0x024231 },
-	{ "Australia/Sydney"                  , 0x02454E },
-	{ "Australia/Tasmania"                , 0x02488B },
-	{ "Australia/Victoria"                , 0x024BD0 },
-	{ "Australia/West"                    , 0x024EED },
-	{ "Australia/Yancowinna"              , 0x024FA3 },
-	{ "Brazil/Acre"                       , 0x0252C5 },
-	{ "Brazil/DeNoronha"                  , 0x0253C4 },
-	{ "Brazil/East"                       , 0x0254E4 },
-	{ "Brazil/West"                       , 0x0257C1 },
-	{ "Canada/Atlantic"                   , 0x0258B9 },
-	{ "Canada/Central"                    , 0x025DA1 },
-	{ "Canada/East-Saskatchewan"          , 0x0266AB },
-	{ "Canada/Eastern"                    , 0x0261BB },
-	{ "Canada/Mountain"                   , 0x026834 },
-	{ "Canada/Newfoundland"               , 0x026BAA },
-	{ "Canada/Pacific"                    , 0x0270D5 },
-	{ "Canada/Saskatchewan"               , 0x0274EE },
-	{ "Canada/Yukon"                      , 0x027677 },
-	{ "CET"                               , 0x02797A },
-	{ "Chile/Continental"                 , 0x027C83 },
-	{ "Chile/EasterIsland"                , 0x02801E },
-	{ "CST6CDT"                           , 0x028360 },
-	{ "Cuba"                              , 0x0286B1 },
-	{ "EET"                               , 0x028A24 },
-	{ "Egypt"                             , 0x028CD7 },
-	{ "Eire"                              , 0x028F9A },
-	{ "EST"                               , 0x0294AB },
-	{ "EST5EDT"                           , 0x0294EF },
-	{ "Etc/GMT"                           , 0x029840 },
-	{ "Etc/GMT+0"                         , 0x02990C },
-	{ "Etc/GMT+1"                         , 0x029996 },
-	{ "Etc/GMT+10"                        , 0x029A23 },
-	{ "Etc/GMT+11"                        , 0x029AB1 },
-	{ "Etc/GMT+12"                        , 0x029B3F },
-	{ "Etc/GMT+2"                         , 0x029C5A },
-	{ "Etc/GMT+3"                         , 0x029CE6 },
-	{ "Etc/GMT+4"                         , 0x029D72 },
-	{ "Etc/GMT+5"                         , 0x029DFE },
-	{ "Etc/GMT+6"                         , 0x029E8A },
-	{ "Etc/GMT+7"                         , 0x029F16 },
-	{ "Etc/GMT+8"                         , 0x029FA2 },
-	{ "Etc/GMT+9"                         , 0x02A02E },
-	{ "Etc/GMT-0"                         , 0x0298C8 },
-	{ "Etc/GMT-1"                         , 0x029950 },
-	{ "Etc/GMT-10"                        , 0x0299DC },
-	{ "Etc/GMT-11"                        , 0x029A6A },
-	{ "Etc/GMT-12"                        , 0x029AF8 },
-	{ "Etc/GMT-13"                        , 0x029B86 },
-	{ "Etc/GMT-14"                        , 0x029BCD },
-	{ "Etc/GMT-2"                         , 0x029C14 },
-	{ "Etc/GMT-3"                         , 0x029CA0 },
-	{ "Etc/GMT-4"                         , 0x029D2C },
-	{ "Etc/GMT-5"                         , 0x029DB8 },
-	{ "Etc/GMT-6"                         , 0x029E44 },
-	{ "Etc/GMT-7"                         , 0x029ED0 },
-	{ "Etc/GMT-8"                         , 0x029F5C },
-	{ "Etc/GMT-9"                         , 0x029FE8 },
-	{ "Etc/GMT0"                          , 0x029884 },
-	{ "Etc/Greenwich"                     , 0x02A074 },
-	{ "Etc/UCT"                           , 0x02A0B8 },
-	{ "Etc/Universal"                     , 0x02A0FC },
-	{ "Etc/UTC"                           , 0x02A140 },
-	{ "Etc/Zulu"                          , 0x02A184 },
-	{ "Europe/Amsterdam"                  , 0x02A1C8 },
-	{ "Europe/Andorra"                    , 0x02A606 },
-	{ "Europe/Athens"                     , 0x02A882 },
-	{ "Europe/Belfast"                    , 0x02ABC5 },
-	{ "Europe/Belgrade"                   , 0x02B0FC },
-	{ "Europe/Berlin"                     , 0x02B3C5 },
-	{ "Europe/Bratislava"                 , 0x02B729 },
-	{ "Europe/Brussels"                   , 0x02BA5B },
-	{ "Europe/Bucharest"                  , 0x02BE92 },
-	{ "Europe/Budapest"                   , 0x02C1BC },
-	{ "Europe/Busingen"                   , 0x02C52F },
-	{ "Europe/Chisinau"                   , 0x02C7E6 },
-	{ "Europe/Copenhagen"                 , 0x02CB74 },
-	{ "Europe/Dublin"                     , 0x02CE7E },
-	{ "Europe/Gibraltar"                  , 0x02D38F },
-	{ "Europe/Guernsey"                   , 0x02D7E6 },
-	{ "Europe/Helsinki"                   , 0x02DD1D },
-	{ "Europe/Isle_of_Man"                , 0x02DFD3 },
-	{ "Europe/Istanbul"                   , 0x02E50A },
-	{ "Europe/Jersey"                     , 0x02E8F7 },
-	{ "Europe/Kaliningrad"                , 0x02EE2E },
-	{ "Europe/Kiev"                       , 0x02F094 },
-	{ "Europe/Lisbon"                     , 0x02F3AB },
-	{ "Europe/Ljubljana"                  , 0x02F8AF },
-	{ "Europe/London"                     , 0x02FB78 },
-	{ "Europe/Luxembourg"                 , 0x0300AF },
-	{ "Europe/Madrid"                     , 0x030505 },
-	{ "Europe/Malta"                      , 0x0308CB },
-	{ "Europe/Mariehamn"                  , 0x030C84 },
-	{ "Europe/Minsk"                      , 0x030F3A },
-	{ "Europe/Monaco"                     , 0x031148 },
-	{ "Europe/Moscow"                     , 0x031583 },
-	{ "Europe/Nicosia"                    , 0x0317D4 },
-	{ "Europe/Oslo"                       , 0x031ABC },
-	{ "Europe/Paris"                      , 0x031DEE },
-	{ "Europe/Podgorica"                  , 0x032234 },
-	{ "Europe/Prague"                     , 0x0324FD },
-	{ "Europe/Riga"                       , 0x03282F },
-	{ "Europe/Rome"                       , 0x032B74 },
-	{ "Europe/Samara"                     , 0x032F37 },
-	{ "Europe/San_Marino"                 , 0x03316A },
-	{ "Europe/Sarajevo"                   , 0x03352D },
-	{ "Europe/Simferopol"                 , 0x0337F6 },
-	{ "Europe/Skopje"                     , 0x033B21 },
-	{ "Europe/Sofia"                      , 0x033DEA },
-	{ "Europe/Stockholm"                  , 0x0340F2 },
-	{ "Europe/Tallinn"                    , 0x0343A1 },
-	{ "Europe/Tirane"                     , 0x0346DB },
-	{ "Europe/Tiraspol"                   , 0x0349E1 },
-	{ "Europe/Uzhgorod"                   , 0x034D6F },
-	{ "Europe/Vaduz"                      , 0x035086 },
-	{ "Europe/Vatican"                    , 0x035319 },
-	{ "Europe/Vienna"                     , 0x0356DC },
-	{ "Europe/Vilnius"                    , 0x035A09 },
-	{ "Europe/Volgograd"                  , 0x035D48 },
-	{ "Europe/Warsaw"                     , 0x035F48 },
-	{ "Europe/Zagreb"                     , 0x036329 },
-	{ "Europe/Zaporozhye"                 , 0x0365F2 },
-	{ "Europe/Zurich"                     , 0x036933 },
-	{ "Factory"                           , 0x036BE2 },
-	{ "GB"                                , 0x036C53 },
-	{ "GB-Eire"                           , 0x03718A },
-	{ "GMT"                               , 0x0376C1 },
-	{ "GMT+0"                             , 0x03778D },
-	{ "GMT-0"                             , 0x037749 },
-	{ "GMT0"                              , 0x037705 },
-	{ "Greenwich"                         , 0x0377D1 },
-	{ "Hongkong"                          , 0x037815 },
-	{ "HST"                               , 0x0379D7 },
-	{ "Iceland"                           , 0x037A1B },
-	{ "Indian/Antananarivo"               , 0x037BD4 },
-	{ "Indian/Chagos"                     , 0x037C48 },
-	{ "Indian/Christmas"                  , 0x037CAA },
-	{ "Indian/Cocos"                      , 0x037CEE },
-	{ "Indian/Comoro"                     , 0x037D32 },
-	{ "Indian/Kerguelen"                  , 0x037D87 },
-	{ "Indian/Mahe"                       , 0x037DDC },
-	{ "Indian/Maldives"                   , 0x037E31 },
-	{ "Indian/Mauritius"                  , 0x037E86 },
-	{ "Indian/Mayotte"                    , 0x037EFC },
-	{ "Indian/Reunion"                    , 0x037F51 },
-	{ "Iran"                              , 0x037FA6 },
-	{ "Israel"                            , 0x038214 },
-	{ "Jamaica"                           , 0x038543 },
-	{ "Japan"                             , 0x038608 },
-	{ "Kwajalein"                         , 0x038691 },
-	{ "Libya"                             , 0x0386F4 },
-	{ "MET"                               , 0x0388ED },
-	{ "Mexico/BajaNorte"                  , 0x038BF6 },
-	{ "Mexico/BajaSur"                    , 0x038F5F },
-	{ "Mexico/General"                    , 0x0391A4 },
-	{ "MST"                               , 0x039402 },
-	{ "MST7MDT"                           , 0x039446 },
-	{ "Navajo"                            , 0x039797 },
-	{ "NZ"                                , 0x039B10 },
-	{ "NZ-CHAT"                           , 0x039E8E },
-	{ "Pacific/Apia"                      , 0x03A176 },
-	{ "Pacific/Auckland"                  , 0x03A312 },
-	{ "Pacific/Chatham"                   , 0x03A69E },
-	{ "Pacific/Chuuk"                     , 0x03A995 },
-	{ "Pacific/Easter"                    , 0x03A9EE },
-	{ "Pacific/Efate"                     , 0x03AD4C },
-	{ "Pacific/Enderbury"                 , 0x03AE12 },
-	{ "Pacific/Fakaofo"                   , 0x03AE80 },
-	{ "Pacific/Fiji"                      , 0x03AED1 },
-	{ "Pacific/Funafuti"                  , 0x03B064 },
-	{ "Pacific/Galapagos"                 , 0x03B0A8 },
-	{ "Pacific/Gambier"                   , 0x03B120 },
-	{ "Pacific/Guadalcanal"               , 0x03B185 },
-	{ "Pacific/Guam"                      , 0x03B1DA },
-	{ "Pacific/Honolulu"                  , 0x03B230 },
-	{ "Pacific/Johnston"                  , 0x03B2A7 },
-	{ "Pacific/Kiritimati"                , 0x03B2F9 },
-	{ "Pacific/Kosrae"                    , 0x03B364 },
-	{ "Pacific/Kwajalein"                 , 0x03B3C1 },
-	{ "Pacific/Majuro"                    , 0x03B42D },
-	{ "Pacific/Marquesas"                 , 0x03B48C },
-	{ "Pacific/Midway"                    , 0x03B4F3 },
-	{ "Pacific/Nauru"                     , 0x03B57D },
-	{ "Pacific/Niue"                      , 0x03B5F5 },
-	{ "Pacific/Norfolk"                   , 0x03B653 },
-	{ "Pacific/Noumea"                    , 0x03B6A8 },
-	{ "Pacific/Pago_Pago"                 , 0x03B738 },
-	{ "Pacific/Palau"                     , 0x03B7C1 },
-	{ "Pacific/Pitcairn"                  , 0x03B805 },
-	{ "Pacific/Pohnpei"                   , 0x03B85A },
-	{ "Pacific/Ponape"                    , 0x03B8AF },
-	{ "Pacific/Port_Moresby"              , 0x03B8F4 },
-	{ "Pacific/Rarotonga"                 , 0x03B938 },
-	{ "Pacific/Saipan"                    , 0x03BA14 },
-	{ "Pacific/Samoa"                     , 0x03BA77 },
-	{ "Pacific/Tahiti"                    , 0x03BB00 },
-	{ "Pacific/Tarawa"                    , 0x03BB65 },
-	{ "Pacific/Tongatapu"                 , 0x03BBB9 },
-	{ "Pacific/Truk"                      , 0x03BC45 },
-	{ "Pacific/Wake"                      , 0x03BC8A },
-	{ "Pacific/Wallis"                    , 0x03BCDA },
-	{ "Pacific/Yap"                       , 0x03BD1E },
-	{ "Poland"                            , 0x03BD63 },
-	{ "Portugal"                          , 0x03C144 },
-	{ "PRC"                               , 0x03C640 },
-	{ "PST8PDT"                           , 0x03C6F1 },
-	{ "ROC"                               , 0x03CA42 },
-	{ "ROK"                               , 0x03CB5A },
-	{ "Singapore"                         , 0x03CBFE },
-	{ "Turkey"                            , 0x03CCB5 },
-	{ "UCT"                               , 0x03D0A2 },
-	{ "Universal"                         , 0x03D0E6 },
-	{ "US/Alaska"                         , 0x03D12A },
-	{ "US/Aleutian"                       , 0x03D493 },
-	{ "US/Arizona"                        , 0x03D7F9 },
-	{ "US/Central"                        , 0x03D887 },
-	{ "US/East-Indiana"                   , 0x03E291 },
-	{ "US/Eastern"                        , 0x03DD92 },
-	{ "US/Hawaii"                         , 0x03E4FB },
-	{ "US/Indiana-Starke"                 , 0x03E56C },
-	{ "US/Michigan"                       , 0x03E8DD },
-	{ "US/Mountain"                       , 0x03EC14 },
-	{ "US/Pacific"                        , 0x03EF8D },
-	{ "US/Pacific-New"                    , 0x03F392 },
-	{ "US/Samoa"                          , 0x03F797 },
-	{ "UTC"                               , 0x03F820 },
-	{ "W-SU"                              , 0x03FB17 },
-	{ "WET"                               , 0x03F864 },
-	{ "Zulu"                              , 0x03FD51 },
+	{ "America/Argentina/Buenos_Aires"    , 0x002B72 },
+	{ "America/Argentina/Catamarca"       , 0x002D20 },
+	{ "America/Argentina/ComodRivadavia"  , 0x002EE1 },
+	{ "America/Argentina/Cordoba"         , 0x003087 },
+	{ "America/Argentina/Jujuy"           , 0x00325C },
+	{ "America/Argentina/La_Rioja"        , 0x003410 },
+	{ "America/Argentina/Mendoza"         , 0x0035C8 },
+	{ "America/Argentina/Rio_Gallegos"    , 0x003788 },
+	{ "America/Argentina/Salta"           , 0x00393D },
+	{ "America/Argentina/San_Juan"        , 0x003AE9 },
+	{ "America/Argentina/San_Luis"        , 0x003CA1 },
+	{ "America/Argentina/Tucuman"         , 0x003E67 },
+	{ "America/Argentina/Ushuaia"         , 0x004023 },
+	{ "America/Aruba"                     , 0x0041DE },
+	{ "America/Asuncion"                  , 0x004244 },
+	{ "America/Atikokan"                  , 0x004529 },
+	{ "America/Atka"                      , 0x0045FF },
+	{ "America/Bahia"                     , 0x004965 },
+	{ "America/Bahia_Banderas"            , 0x004AF8 },
+	{ "America/Barbados"                  , 0x004D71 },
+	{ "America/Belem"                     , 0x004E0B },
+	{ "America/Belize"                    , 0x004F06 },
+	{ "America/Blanc-Sablon"              , 0x005082 },
+	{ "America/Boa_Vista"                 , 0x005136 },
+	{ "America/Bogota"                    , 0x00523F },
+	{ "America/Boise"                     , 0x0052AB },
+	{ "America/Buenos_Aires"              , 0x005642 },
+	{ "America/Cambridge_Bay"             , 0x0057DB },
+	{ "America/Campo_Grande"              , 0x005B03 },
+	{ "America/Cancun"                    , 0x005DF2 },
+	{ "America/Caracas"                   , 0x006034 },
+	{ "America/Catamarca"                 , 0x00609B },
+	{ "America/Cayenne"                   , 0x006241 },
+	{ "America/Cayman"                    , 0x0062A3 },
+	{ "America/Chicago"                   , 0x0062F8 },
+	{ "America/Chihuahua"                 , 0x00680F },
+	{ "America/Coral_Harbour"             , 0x006A7A },
+	{ "America/Cordoba"                   , 0x006B0C },
+	{ "America/Costa_Rica"                , 0x006CB2 },
+	{ "America/Creston"                   , 0x006D3C },
+	{ "America/Cuiaba"                    , 0x006DC8 },
+	{ "America/Curacao"                   , 0x0070A6 },
+	{ "America/Danmarkshavn"              , 0x00710C },
+	{ "America/Dawson"                    , 0x007250 },
+	{ "America/Dawson_Creek"              , 0x00756D },
+	{ "America/Denver"                    , 0x007747 },
+	{ "America/Detroit"                   , 0x007ACD },
+	{ "America/Dominica"                  , 0x007E2C },
+	{ "America/Edmonton"                  , 0x007E81 },
+	{ "America/Eirunepe"                  , 0x008239 },
+	{ "America/El_Salvador"               , 0x00834C },
+	{ "America/Ensenada"                  , 0x0083C1 },
+	{ "America/Fort_Wayne"                , 0x008868 },
+	{ "America/Fortaleza"                 , 0x00872A },
+	{ "America/Glace_Bay"                 , 0x008AD2 },
+	{ "America/Godthab"                   , 0x008E49 },
+	{ "America/Goose_Bay"                 , 0x00910D },
+	{ "America/Grand_Turk"                , 0x0095CA },
+	{ "America/Grenada"                   , 0x009879 },
+	{ "America/Guadeloupe"                , 0x0098CE },
+	{ "America/Guatemala"                 , 0x009923 },
+	{ "America/Guayaquil"                 , 0x0099AC },
+	{ "America/Guyana"                    , 0x009A09 },
+	{ "America/Halifax"                   , 0x009A8A },
+	{ "America/Havana"                    , 0x009FA0 },
+	{ "America/Hermosillo"                , 0x00A313 },
+	{ "America/Indiana/Indianapolis"      , 0x00A3F1 },
+	{ "America/Indiana/Knox"              , 0x00A682 },
+	{ "America/Indiana/Marengo"           , 0x00AA19 },
+	{ "America/Indiana/Petersburg"        , 0x00ACBF },
+	{ "America/Indiana/Tell_City"         , 0x00B20C },
+	{ "America/Indiana/Vevay"             , 0x00B4A5 },
+	{ "America/Indiana/Vincennes"         , 0x00B6E0 },
+	{ "America/Indiana/Winamac"           , 0x00B994 },
+	{ "America/Indianapolis"              , 0x00AFA2 },
+	{ "America/Inuvik"                    , 0x00BC4D },
+	{ "America/Iqaluit"                   , 0x00BF44 },
+	{ "America/Jamaica"                   , 0x00C266 },
+	{ "America/Jujuy"                     , 0x00C32B },
+	{ "America/Juneau"                    , 0x00C4D5 },
+	{ "America/Kentucky/Louisville"       , 0x00C853 },
+	{ "America/Kentucky/Monticello"       , 0x00CC71 },
+	{ "America/Knox_IN"                   , 0x00CFF6 },
+	{ "America/Kralendijk"                , 0x00D367 },
+	{ "America/La_Paz"                    , 0x00D3CD },
+	{ "America/Lima"                      , 0x00D434 },
+	{ "America/Los_Angeles"               , 0x00D4DC },
+	{ "America/Louisville"                , 0x00D8ED },
+	{ "America/Lower_Princes"             , 0x00DCE2 },
+	{ "America/Maceio"                    , 0x00DD48 },
+	{ "America/Managua"                   , 0x00DE82 },
+	{ "America/Manaus"                    , 0x00DF35 },
+	{ "America/Marigot"                   , 0x00E037 },
+	{ "America/Martinique"                , 0x00E08C },
+	{ "America/Matamoros"                 , 0x00E0F8 },
+	{ "America/Mazatlan"                  , 0x00E351 },
+	{ "America/Mendoza"                   , 0x00E5BE },
+	{ "America/Menominee"                 , 0x00E772 },
+	{ "America/Merida"                    , 0x00EAF3 },
+	{ "America/Metlakatla"                , 0x00ED2E },
+	{ "America/Mexico_City"               , 0x00EE68 },
+	{ "America/Miquelon"                  , 0x00F0E3 },
+	{ "America/Moncton"                   , 0x00F355 },
+	{ "America/Monterrey"                 , 0x00F7EC },
+	{ "America/Montevideo"                , 0x00FA4F },
+	{ "America/Montreal"                  , 0x00FD61 },
+	{ "America/Montserrat"                , 0x010251 },
+	{ "America/Nassau"                    , 0x0102A6 },
+	{ "America/New_York"                  , 0x0105EB },
+	{ "America/Nipigon"                   , 0x010AF6 },
+	{ "America/Nome"                      , 0x010E47 },
+	{ "America/Noronha"                   , 0x0111C5 },
+	{ "America/North_Dakota/Beulah"       , 0x0112F5 },
+	{ "America/North_Dakota/Center"       , 0x011689 },
+	{ "America/North_Dakota/New_Salem"    , 0x011A1D },
+	{ "America/Ojinaga"                   , 0x011DC6 },
+	{ "America/Panama"                    , 0x012027 },
+	{ "America/Pangnirtung"               , 0x01207C },
+	{ "America/Paramaribo"                , 0x0123B2 },
+	{ "America/Phoenix"                   , 0x012444 },
+	{ "America/Port-au-Prince"            , 0x012502 },
+	{ "America/Port_of_Spain"             , 0x012821 },
+	{ "America/Porto_Acre"                , 0x012722 },
+	{ "America/Porto_Velho"               , 0x012876 },
+	{ "America/Puerto_Rico"               , 0x01296C },
+	{ "America/Rainy_River"               , 0x0129D7 },
+	{ "America/Rankin_Inlet"              , 0x012D0F },
+	{ "America/Recife"                    , 0x012FF5 },
+	{ "America/Regina"                    , 0x01311F },
+	{ "America/Resolute"                  , 0x0132DD },
+	{ "America/Rio_Branco"                , 0x0135CE },
+	{ "America/Rosario"                   , 0x0136D1 },
+	{ "America/Santa_Isabel"              , 0x013877 },
+	{ "America/Santarem"                  , 0x013C1A },
+	{ "America/Santiago"                  , 0x013D1F },
+	{ "America/Santo_Domingo"             , 0x0140C8 },
+	{ "America/Sao_Paulo"                 , 0x01418E },
+	{ "America/Scoresbysund"              , 0x01449D },
+	{ "America/Shiprock"                  , 0x01478B },
+	{ "America/Sitka"                     , 0x014B04 },
+	{ "America/St_Barthelemy"             , 0x014E8C },
+	{ "America/St_Johns"                  , 0x014EE1 },
+	{ "America/St_Kitts"                  , 0x015434 },
+	{ "America/St_Lucia"                  , 0x015489 },
+	{ "America/St_Thomas"                 , 0x0154DE },
+	{ "America/St_Vincent"                , 0x015533 },
+	{ "America/Swift_Current"             , 0x015588 },
+	{ "America/Tegucigalpa"               , 0x0156A9 },
+	{ "America/Thule"                     , 0x015728 },
+	{ "America/Thunder_Bay"               , 0x01596F },
+	{ "America/Tijuana"                   , 0x015CB8 },
+	{ "America/Toronto"                   , 0x016051 },
+	{ "America/Tortola"                   , 0x016571 },
+	{ "America/Vancouver"                 , 0x0165C6 },
+	{ "America/Virgin"                    , 0x016A03 },
+	{ "America/Whitehorse"                , 0x016A58 },
+	{ "America/Winnipeg"                  , 0x016D75 },
+	{ "America/Yakutat"                   , 0x0171B5 },
+	{ "America/Yellowknife"               , 0x017520 },
+	{ "Antarctica/Casey"                  , 0x017830 },
+	{ "Antarctica/Davis"                  , 0x0178CD },
+	{ "Antarctica/DumontDUrville"         , 0x01796E },
+	{ "Antarctica/Macquarie"              , 0x017A00 },
+	{ "Antarctica/Mawson"                 , 0x017C47 },
+	{ "Antarctica/McMurdo"                , 0x017CC3 },
+	{ "Antarctica/Palmer"                 , 0x01806E },
+	{ "Antarctica/Rothera"                , 0x01838A },
+	{ "Antarctica/South_Pole"             , 0x018400 },
+	{ "Antarctica/Syowa"                  , 0x01877E },
+	{ "Antarctica/Vostok"                 , 0x0187EC },
+	{ "Arctic/Longyearbyen"               , 0x01885D },
+	{ "Asia/Aden"                         , 0x018B8F },
+	{ "Asia/Almaty"                       , 0x018BE4 },
+	{ "Asia/Amman"                        , 0x018D63 },
+	{ "Asia/Anadyr"                       , 0x018F35 },
+	{ "Asia/Aqtau"                        , 0x01911A },
+	{ "Asia/Aqtobe"                       , 0x019319 },
+	{ "Asia/Ashgabat"                     , 0x0194D1 },
+	{ "Asia/Ashkhabad"                    , 0x0195EE },
+	{ "Asia/Baghdad"                      , 0x01970B },
+	{ "Asia/Bahrain"                      , 0x019880 },
+	{ "Asia/Baku"                         , 0x0198E6 },
+	{ "Asia/Bangkok"                      , 0x019BCE },
+	{ "Asia/Beirut"                       , 0x019C23 },
+	{ "Asia/Bishkek"                      , 0x019F30 },
+	{ "Asia/Brunei"                       , 0x01A0DC },
+	{ "Asia/Calcutta"                     , 0x01A13E },
+	{ "Asia/Choibalsan"                   , 0x01A1B7 },
+	{ "Asia/Chongqing"                    , 0x01A330 },
+	{ "Asia/Chungking"                    , 0x01A41F },
+	{ "Asia/Colombo"                      , 0x01A4CE },
+	{ "Asia/Dacca"                        , 0x01A56A },
+	{ "Asia/Damascus"                     , 0x01A610 },
+	{ "Asia/Dhaka"                        , 0x01A960 },
+	{ "Asia/Dili"                         , 0x01AA06 },
+	{ "Asia/Dubai"                        , 0x01AA90 },
+	{ "Asia/Dushanbe"                     , 0x01AAE5 },
+	{ "Asia/Gaza"                         , 0x01ABE8 },
+	{ "Asia/Harbin"                       , 0x01AF3B },
+	{ "Asia/Hebron"                       , 0x01B022 },
+	{ "Asia/Ho_Chi_Minh"                  , 0x01B37E },
+	{ "Asia/Hong_Kong"                    , 0x01B3F6 },
+	{ "Asia/Hovd"                         , 0x01B5B8 },
+	{ "Asia/Irkutsk"                      , 0x01B730 },
+	{ "Asia/Istanbul"                     , 0x01B916 },
+	{ "Asia/Jakarta"                      , 0x01BD03 },
+	{ "Asia/Jayapura"                     , 0x01BDAD },
+	{ "Asia/Jerusalem"                    , 0x01BE49 },
+	{ "Asia/Kabul"                        , 0x01C178 },
+	{ "Asia/Kamchatka"                    , 0x01C1C9 },
+	{ "Asia/Karachi"                      , 0x01C3A5 },
+	{ "Asia/Kashgar"                      , 0x01C45A },
+	{ "Asia/Kathmandu"                    , 0x01C52B },
+	{ "Asia/Katmandu"                     , 0x01C591 },
+	{ "Asia/Khandyga"                     , 0x01C5F7 },
+	{ "Asia/Kolkata"                      , 0x01C81C },
+	{ "Asia/Krasnoyarsk"                  , 0x01C895 },
+	{ "Asia/Kuala_Lumpur"                 , 0x01CA7D },
+	{ "Asia/Kuching"                      , 0x01CB3A },
+	{ "Asia/Kuwait"                       , 0x01CC28 },
+	{ "Asia/Macao"                        , 0x01CC7D },
+	{ "Asia/Macau"                        , 0x01CDB8 },
+	{ "Asia/Magadan"                      , 0x01CEF3 },
+	{ "Asia/Makassar"                     , 0x01D0D5 },
+	{ "Asia/Manila"                       , 0x01D19A },
+	{ "Asia/Muscat"                       , 0x01D21F },
+	{ "Asia/Nicosia"                      , 0x01D274 },
+	{ "Asia/Novokuznetsk"                 , 0x01D55C },
+	{ "Asia/Novosibirsk"                  , 0x01D75E },
+	{ "Asia/Omsk"                         , 0x01D949 },
+	{ "Asia/Oral"                         , 0x01DB30 },
+	{ "Asia/Phnom_Penh"                   , 0x01DD00 },
+	{ "Asia/Pontianak"                    , 0x01DD78 },
+	{ "Asia/Pyongyang"                    , 0x01DE3A },
+	{ "Asia/Qatar"                        , 0x01DEA7 },
+	{ "Asia/Qyzylorda"                    , 0x01DF0D },
+	{ "Asia/Rangoon"                      , 0x01E0E3 },
+	{ "Asia/Riyadh"                       , 0x01E15B },
+	{ "Asia/Saigon"                       , 0x01E1B0 },
+	{ "Asia/Sakhalin"                     , 0x01E228 },
+	{ "Asia/Samarkand"                    , 0x01E41F },
+	{ "Asia/Seoul"                        , 0x01E555 },
+	{ "Asia/Shanghai"                     , 0x01E5F9 },
+	{ "Asia/Singapore"                    , 0x01E6D9 },
+	{ "Asia/Taipei"                       , 0x01E790 },
+	{ "Asia/Tashkent"                     , 0x01E8A8 },
+	{ "Asia/Tbilisi"                      , 0x01E9D9 },
+	{ "Asia/Tehran"                       , 0x01EB93 },
+	{ "Asia/Tel_Aviv"                     , 0x01EE01 },
+	{ "Asia/Thimbu"                       , 0x01F130 },
+	{ "Asia/Thimphu"                      , 0x01F196 },
+	{ "Asia/Tokyo"                        , 0x01F1FC },
+	{ "Asia/Ujung_Pandang"                , 0x01F285 },
+	{ "Asia/Ulaanbaatar"                  , 0x01F302 },
+	{ "Asia/Ulan_Bator"                   , 0x01F45D },
+	{ "Asia/Urumqi"                       , 0x01F5AA },
+	{ "Asia/Ust-Nera"                     , 0x01F671 },
+	{ "Asia/Vientiane"                    , 0x01F876 },
+	{ "Asia/Vladivostok"                  , 0x01F8EE },
+	{ "Asia/Yakutsk"                      , 0x01FADA },
+	{ "Asia/Yekaterinburg"                , 0x01FCBF },
+	{ "Asia/Yerevan"                      , 0x01FECA },
+	{ "Atlantic/Azores"                   , 0x0200CA },
+	{ "Atlantic/Bermuda"                  , 0x0205CD },
+	{ "Atlantic/Canary"                   , 0x0208AE },
+	{ "Atlantic/Cape_Verde"               , 0x020B84 },
+	{ "Atlantic/Faeroe"                   , 0x020BFD },
+	{ "Atlantic/Faroe"                    , 0x020EA1 },
+	{ "Atlantic/Jan_Mayen"                , 0x021145 },
+	{ "Atlantic/Madeira"                  , 0x021477 },
+	{ "Atlantic/Reykjavik"                , 0x021980 },
+	{ "Atlantic/South_Georgia"            , 0x021B39 },
+	{ "Atlantic/St_Helena"                , 0x021D4B },
+	{ "Atlantic/Stanley"                  , 0x021B7D },
+	{ "Australia/ACT"                     , 0x021DA0 },
+	{ "Australia/Adelaide"                , 0x0220BD },
+	{ "Australia/Brisbane"                , 0x0223E9 },
+	{ "Australia/Broken_Hill"             , 0x0224B0 },
+	{ "Australia/Canberra"                , 0x0227EE },
+	{ "Australia/Currie"                  , 0x022B0B },
+	{ "Australia/Darwin"                  , 0x022E3E },
+	{ "Australia/Eucla"                   , 0x022EC4 },
+	{ "Australia/Hobart"                  , 0x022F99 },
+	{ "Australia/LHI"                     , 0x0232F7 },
+	{ "Australia/Lindeman"                , 0x023592 },
+	{ "Australia/Lord_Howe"               , 0x023673 },
+	{ "Australia/Melbourne"               , 0x02391E },
+	{ "Australia/North"                   , 0x023C43 },
+	{ "Australia/NSW"                     , 0x023CB7 },
+	{ "Australia/Perth"                   , 0x023FD4 },
+	{ "Australia/Queensland"              , 0x0240AC },
+	{ "Australia/South"                   , 0x024158 },
+	{ "Australia/Sydney"                  , 0x024475 },
+	{ "Australia/Tasmania"                , 0x0247B2 },
+	{ "Australia/Victoria"                , 0x024AF7 },
+	{ "Australia/West"                    , 0x024E14 },
+	{ "Australia/Yancowinna"              , 0x024ECA },
+	{ "Brazil/Acre"                       , 0x0251EC },
+	{ "Brazil/DeNoronha"                  , 0x0252EB },
+	{ "Brazil/East"                       , 0x02540B },
+	{ "Brazil/West"                       , 0x0256E8 },
+	{ "Canada/Atlantic"                   , 0x0257E0 },
+	{ "Canada/Central"                    , 0x025CC8 },
+	{ "Canada/East-Saskatchewan"          , 0x0265D2 },
+	{ "Canada/Eastern"                    , 0x0260E2 },
+	{ "Canada/Mountain"                   , 0x02675B },
+	{ "Canada/Newfoundland"               , 0x026AD1 },
+	{ "Canada/Pacific"                    , 0x026FFC },
+	{ "Canada/Saskatchewan"               , 0x027415 },
+	{ "Canada/Yukon"                      , 0x02759E },
+	{ "CET"                               , 0x0278A1 },
+	{ "Chile/Continental"                 , 0x027BAA },
+	{ "Chile/EasterIsland"                , 0x027F45 },
+	{ "CST6CDT"                           , 0x028287 },
+	{ "Cuba"                              , 0x0285D8 },
+	{ "EET"                               , 0x02894B },
+	{ "Egypt"                             , 0x028BFE },
+	{ "Eire"                              , 0x028EC1 },
+	{ "EST"                               , 0x0293D2 },
+	{ "EST5EDT"                           , 0x029416 },
+	{ "Etc/GMT"                           , 0x029767 },
+	{ "Etc/GMT+0"                         , 0x029833 },
+	{ "Etc/GMT+1"                         , 0x0298BD },
+	{ "Etc/GMT+10"                        , 0x02994A },
+	{ "Etc/GMT+11"                        , 0x0299D8 },
+	{ "Etc/GMT+12"                        , 0x029A66 },
+	{ "Etc/GMT+2"                         , 0x029B81 },
+	{ "Etc/GMT+3"                         , 0x029C0D },
+	{ "Etc/GMT+4"                         , 0x029C99 },
+	{ "Etc/GMT+5"                         , 0x029D25 },
+	{ "Etc/GMT+6"                         , 0x029DB1 },
+	{ "Etc/GMT+7"                         , 0x029E3D },
+	{ "Etc/GMT+8"                         , 0x029EC9 },
+	{ "Etc/GMT+9"                         , 0x029F55 },
+	{ "Etc/GMT-0"                         , 0x0297EF },
+	{ "Etc/GMT-1"                         , 0x029877 },
+	{ "Etc/GMT-10"                        , 0x029903 },
+	{ "Etc/GMT-11"                        , 0x029991 },
+	{ "Etc/GMT-12"                        , 0x029A1F },
+	{ "Etc/GMT-13"                        , 0x029AAD },
+	{ "Etc/GMT-14"                        , 0x029AF4 },
+	{ "Etc/GMT-2"                         , 0x029B3B },
+	{ "Etc/GMT-3"                         , 0x029BC7 },
+	{ "Etc/GMT-4"                         , 0x029C53 },
+	{ "Etc/GMT-5"                         , 0x029CDF },
+	{ "Etc/GMT-6"                         , 0x029D6B },
+	{ "Etc/GMT-7"                         , 0x029DF7 },
+	{ "Etc/GMT-8"                         , 0x029E83 },
+	{ "Etc/GMT-9"                         , 0x029F0F },
+	{ "Etc/GMT0"                          , 0x0297AB },
+	{ "Etc/Greenwich"                     , 0x029F9B },
+	{ "Etc/UCT"                           , 0x029FDF },
+	{ "Etc/Universal"                     , 0x02A023 },
+	{ "Etc/UTC"                           , 0x02A067 },
+	{ "Etc/Zulu"                          , 0x02A0AB },
+	{ "Europe/Amsterdam"                  , 0x02A0EF },
+	{ "Europe/Andorra"                    , 0x02A52D },
+	{ "Europe/Athens"                     , 0x02A7A9 },
+	{ "Europe/Belfast"                    , 0x02AAEC },
+	{ "Europe/Belgrade"                   , 0x02B023 },
+	{ "Europe/Berlin"                     , 0x02B2EC },
+	{ "Europe/Bratislava"                 , 0x02B650 },
+	{ "Europe/Brussels"                   , 0x02B982 },
+	{ "Europe/Bucharest"                  , 0x02BDB9 },
+	{ "Europe/Budapest"                   , 0x02C0E3 },
+	{ "Europe/Busingen"                   , 0x02C456 },
+	{ "Europe/Chisinau"                   , 0x02C70D },
+	{ "Europe/Copenhagen"                 , 0x02CA9B },
+	{ "Europe/Dublin"                     , 0x02CDA5 },
+	{ "Europe/Gibraltar"                  , 0x02D2B6 },
+	{ "Europe/Guernsey"                   , 0x02D70D },
+	{ "Europe/Helsinki"                   , 0x02DC44 },
+	{ "Europe/Isle_of_Man"                , 0x02DEFA },
+	{ "Europe/Istanbul"                   , 0x02E431 },
+	{ "Europe/Jersey"                     , 0x02E81E },
+	{ "Europe/Kaliningrad"                , 0x02ED55 },
+	{ "Europe/Kiev"                       , 0x02EFBB },
+	{ "Europe/Lisbon"                     , 0x02F2D2 },
+	{ "Europe/Ljubljana"                  , 0x02F7D6 },
+	{ "Europe/London"                     , 0x02FA9F },
+	{ "Europe/Luxembourg"                 , 0x02FFD6 },
+	{ "Europe/Madrid"                     , 0x03042C },
+	{ "Europe/Malta"                      , 0x0307F2 },
+	{ "Europe/Mariehamn"                  , 0x030BAB },
+	{ "Europe/Minsk"                      , 0x030E61 },
+	{ "Europe/Monaco"                     , 0x03106F },
+	{ "Europe/Moscow"                     , 0x0314AA },
+	{ "Europe/Nicosia"                    , 0x0316FB },
+	{ "Europe/Oslo"                       , 0x0319E3 },
+	{ "Europe/Paris"                      , 0x031D15 },
+	{ "Europe/Podgorica"                  , 0x03215B },
+	{ "Europe/Prague"                     , 0x032424 },
+	{ "Europe/Riga"                       , 0x032756 },
+	{ "Europe/Rome"                       , 0x032A9B },
+	{ "Europe/Samara"                     , 0x032E5E },
+	{ "Europe/San_Marino"                 , 0x033091 },
+	{ "Europe/Sarajevo"                   , 0x033454 },
+	{ "Europe/Simferopol"                 , 0x03371D },
+	{ "Europe/Skopje"                     , 0x033A48 },
+	{ "Europe/Sofia"                      , 0x033D11 },
+	{ "Europe/Stockholm"                  , 0x034019 },
+	{ "Europe/Tallinn"                    , 0x0342C8 },
+	{ "Europe/Tirane"                     , 0x034602 },
+	{ "Europe/Tiraspol"                   , 0x034908 },
+	{ "Europe/Uzhgorod"                   , 0x034C96 },
+	{ "Europe/Vaduz"                      , 0x034FAD },
+	{ "Europe/Vatican"                    , 0x03525C },
+	{ "Europe/Vienna"                     , 0x03561F },
+	{ "Europe/Vilnius"                    , 0x03594C },
+	{ "Europe/Volgograd"                  , 0x035C8B },
+	{ "Europe/Warsaw"                     , 0x035E8B },
+	{ "Europe/Zagreb"                     , 0x03626C },
+	{ "Europe/Zaporozhye"                 , 0x036535 },
+	{ "Europe/Zurich"                     , 0x036876 },
+	{ "Factory"                           , 0x036B25 },
+	{ "GB"                                , 0x036B96 },
+	{ "GB-Eire"                           , 0x0370CD },
+	{ "GMT"                               , 0x037604 },
+	{ "GMT+0"                             , 0x0376D0 },
+	{ "GMT-0"                             , 0x03768C },
+	{ "GMT0"                              , 0x037648 },
+	{ "Greenwich"                         , 0x037714 },
+	{ "Hongkong"                          , 0x037758 },
+	{ "HST"                               , 0x03791A },
+	{ "Iceland"                           , 0x03795E },
+	{ "Indian/Antananarivo"               , 0x037B17 },
+	{ "Indian/Chagos"                     , 0x037B8B },
+	{ "Indian/Christmas"                  , 0x037BED },
+	{ "Indian/Cocos"                      , 0x037C31 },
+	{ "Indian/Comoro"                     , 0x037C75 },
+	{ "Indian/Kerguelen"                  , 0x037CCA },
+	{ "Indian/Mahe"                       , 0x037D1F },
+	{ "Indian/Maldives"                   , 0x037D74 },
+	{ "Indian/Mauritius"                  , 0x037DC9 },
+	{ "Indian/Mayotte"                    , 0x037E3F },
+	{ "Indian/Reunion"                    , 0x037E94 },
+	{ "Iran"                              , 0x037EE9 },
+	{ "Israel"                            , 0x038157 },
+	{ "Jamaica"                           , 0x038486 },
+	{ "Japan"                             , 0x03854B },
+	{ "Kwajalein"                         , 0x0385D4 },
+	{ "Libya"                             , 0x038637 },
+	{ "MET"                               , 0x038830 },
+	{ "Mexico/BajaNorte"                  , 0x038B39 },
+	{ "Mexico/BajaSur"                    , 0x038EA2 },
+	{ "Mexico/General"                    , 0x0390E7 },
+	{ "MST"                               , 0x039345 },
+	{ "MST7MDT"                           , 0x039389 },
+	{ "Navajo"                            , 0x0396DA },
+	{ "NZ"                                , 0x039A53 },
+	{ "NZ-CHAT"                           , 0x039DD1 },
+	{ "Pacific/Apia"                      , 0x03A0B9 },
+	{ "Pacific/Auckland"                  , 0x03A255 },
+	{ "Pacific/Chatham"                   , 0x03A5E1 },
+	{ "Pacific/Chuuk"                     , 0x03A8D8 },
+	{ "Pacific/Easter"                    , 0x03A931 },
+	{ "Pacific/Efate"                     , 0x03AC8F },
+	{ "Pacific/Enderbury"                 , 0x03AD55 },
+	{ "Pacific/Fakaofo"                   , 0x03ADC3 },
+	{ "Pacific/Fiji"                      , 0x03AE14 },
+	{ "Pacific/Funafuti"                  , 0x03AFA7 },
+	{ "Pacific/Galapagos"                 , 0x03AFEB },
+	{ "Pacific/Gambier"                   , 0x03B063 },
+	{ "Pacific/Guadalcanal"               , 0x03B0C8 },
+	{ "Pacific/Guam"                      , 0x03B11D },
+	{ "Pacific/Honolulu"                  , 0x03B173 },
+	{ "Pacific/Johnston"                  , 0x03B1EA },
+	{ "Pacific/Kiritimati"                , 0x03B269 },
+	{ "Pacific/Kosrae"                    , 0x03B2D4 },
+	{ "Pacific/Kwajalein"                 , 0x03B331 },
+	{ "Pacific/Majuro"                    , 0x03B39D },
+	{ "Pacific/Marquesas"                 , 0x03B3FC },
+	{ "Pacific/Midway"                    , 0x03B463 },
+	{ "Pacific/Nauru"                     , 0x03B4ED },
+	{ "Pacific/Niue"                      , 0x03B565 },
+	{ "Pacific/Norfolk"                   , 0x03B5C3 },
+	{ "Pacific/Noumea"                    , 0x03B618 },
+	{ "Pacific/Pago_Pago"                 , 0x03B6A8 },
+	{ "Pacific/Palau"                     , 0x03B731 },
+	{ "Pacific/Pitcairn"                  , 0x03B775 },
+	{ "Pacific/Pohnpei"                   , 0x03B7CA },
+	{ "Pacific/Ponape"                    , 0x03B81F },
+	{ "Pacific/Port_Moresby"              , 0x03B864 },
+	{ "Pacific/Rarotonga"                 , 0x03B8A8 },
+	{ "Pacific/Saipan"                    , 0x03B984 },
+	{ "Pacific/Samoa"                     , 0x03B9E7 },
+	{ "Pacific/Tahiti"                    , 0x03BA70 },
+	{ "Pacific/Tarawa"                    , 0x03BAD5 },
+	{ "Pacific/Tongatapu"                 , 0x03BB29 },
+	{ "Pacific/Truk"                      , 0x03BBB5 },
+	{ "Pacific/Wake"                      , 0x03BBFA },
+	{ "Pacific/Wallis"                    , 0x03BC4A },
+	{ "Pacific/Yap"                       , 0x03BC8E },
+	{ "Poland"                            , 0x03BCD3 },
+	{ "Portugal"                          , 0x03C0B4 },
+	{ "PRC"                               , 0x03C5B0 },
+	{ "PST8PDT"                           , 0x03C661 },
+	{ "ROC"                               , 0x03C9B2 },
+	{ "ROK"                               , 0x03CACA },
+	{ "Singapore"                         , 0x03CB6E },
+	{ "Turkey"                            , 0x03CC25 },
+	{ "UCT"                               , 0x03D012 },
+	{ "Universal"                         , 0x03D056 },
+	{ "US/Alaska"                         , 0x03D09A },
+	{ "US/Aleutian"                       , 0x03D403 },
+	{ "US/Arizona"                        , 0x03D769 },
+	{ "US/Central"                        , 0x03D7F7 },
+	{ "US/East-Indiana"                   , 0x03E201 },
+	{ "US/Eastern"                        , 0x03DD02 },
+	{ "US/Hawaii"                         , 0x03E46B },
+	{ "US/Indiana-Starke"                 , 0x03E4DC },
+	{ "US/Michigan"                       , 0x03E84D },
+	{ "US/Mountain"                       , 0x03EB84 },
+	{ "US/Pacific"                        , 0x03EEFD },
+	{ "US/Pacific-New"                    , 0x03F302 },
+	{ "US/Samoa"                          , 0x03F707 },
+	{ "UTC"                               , 0x03F790 },
+	{ "W-SU"                              , 0x03FA87 },
+	{ "WET"                               , 0x03F7D4 },
+	{ "Zulu"                              , 0x03FCC1 },
 };
 /* This is a generated file, do not modify */
-const unsigned char timelib_timezone_db_data_builtin[261525] = {
+const unsigned char timelib_timezone_db_data_builtin[261381] = {
 
 
 /* Africa/Abidjan */
@@ -766,8 +766,8 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x1A, 0xB7, 0xA6, 0x00, 0x1E, 0x18, 0x6F, 0xF0, 0x48, 0x41, 0xE6, 0x80, 0x48, 0xBB, 0x22, 0x70, 
 0x4A, 0x23, 0x1A, 0x00, 0x4A, 0x8D, 0xD5, 0x70, 0x4B, 0xDC, 0xC0, 0x80, 0x4C, 0x5D, 0xE5, 0x70, 
 0x4D, 0x97, 0xB8, 0x80, 0x4E, 0x34, 0x8C, 0xF0, 0x4F, 0x9C, 0xA0, 0xA0, 0x50, 0x08, 0xBB, 0xA0, 
-0x50, 0x31, 0x9A, 0x20, 0x50, 0x67, 0xA7, 0xA0, 0x51, 0x7C, 0x82, 0xA0, 0x51, 0xDB, 0x6E, 0xA0, 
-0x52, 0x02, 0xFB, 0xA0, 0x52, 0x47, 0x89, 0xA0, 0x53, 0x5C, 0x64, 0xA0, 0x53, 0xAF, 0x73, 0x20, 
+0x50, 0x31, 0x9A, 0x20, 0x50, 0x67, 0xA7, 0xA0, 0x51, 0x7C, 0x82, 0xA0, 0x51, 0xD8, 0xCB, 0xA0, 
+0x52, 0x05, 0x9E, 0xA0, 0x52, 0x47, 0x89, 0xA0, 0x53, 0x5C, 0x64, 0xA0, 0x53, 0xAF, 0x73, 0x20, 
 0x53, 0xD7, 0x00, 0x20, 0x54, 0x27, 0x6B, 0xA0, 0x55, 0x3C, 0x46, 0xA0, 0x55, 0x82, 0x26, 0x20, 
 0x55, 0xA9, 0xB3, 0x20, 0x56, 0x07, 0x4D, 0xA0, 0x57, 0x1C, 0x28, 0xA0, 0x57, 0x56, 0x2A, 0xA0, 
 0x57, 0x7D, 0xB7, 0xA0, 0x57, 0xE7, 0x2F, 0xA0, 0x59, 0x05, 0x45, 0x20, 0x59, 0x28, 0xDD, 0xA0, 
@@ -945,7 +945,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* Africa/Juba */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x53, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x11, 0xB6, 0xA3, 0xDA, 0xE0, 
+0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x11, 0xB6, 0xA3, 0xDA, 0x00, 
 0x00, 0x9E, 0x17, 0xE0, 0x01, 0x7A, 0x34, 0x50, 0x02, 0x7D, 0xF9, 0xE0, 0x03, 0x5B, 0x67, 0xD0, 
 0x04, 0x60, 0x7E, 0xE0, 0x05, 0x3D, 0xEC, 0xD0, 0x06, 0x40, 0x60, 0xE0, 0x07, 0x1F, 0x20, 0x50, 
 0x08, 0x20, 0x42, 0xE0, 0x09, 0x00, 0x53, 0xD0, 0x0A, 0x00, 0x24, 0xE0, 0x0A, 0xE1, 0x87, 0x50, 
@@ -956,7 +956,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x1A, 0xF1, 0x8B, 0xE0, 0x1B, 0xD0, 0x4B, 0x50, 0x1C, 0xD1, 0x6D, 0xE0, 0x1D, 0xB1, 0x7E, 0xD0, 
 0x38, 0x80, 0x45, 0x20, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x00, 0x00, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 
+0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x00, 0x00, 0x1E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 
 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x0D, 0x4C, 0x4D, 
 0x54, 0x00, 0x43, 0x41, 0x53, 0x54, 0x00, 0x43, 0x41, 0x54, 0x00, 0x45, 0x41, 0x54, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0xBA, 0xC8, 0x01, 0x42, 0xE0, 0x40, 0x00, 
@@ -1390,8 +1390,8 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/Anguilla */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x35, 0x20, 
-0x01, 0xFF, 0xFF, 0xC4, 0xE0, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA5, 0x19, 0xA0, 0x00, 0xB2, 0x6D, 
 0x15, 0x00, 0x00, 0x00, 0x00, 
 
@@ -1407,7 +1407,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/Araguaina */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x42, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0D, 0x96, 0xAA, 0x74, 0x30, 
+0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0D, 0x96, 0xAA, 0x74, 0x30, 
 0xB8, 0x0F, 0x49, 0xE0, 0xB8, 0xFD, 0x40, 0xA0, 0xB9, 0xF1, 0x34, 0x30, 0xBA, 0xDE, 0x74, 0x20, 
 0xDA, 0x38, 0xAE, 0x30, 0xDA, 0xEB, 0xFA, 0x30, 0xDC, 0x19, 0xE1, 0xB0, 0xDC, 0xB9, 0x59, 0x20, 
 0xDD, 0xFB, 0x15, 0x30, 0xDE, 0x9B, 0xDE, 0x20, 0xDF, 0xDD, 0x9A, 0x30, 0xE0, 0x54, 0x33, 0x20, 
@@ -1420,29 +1420,14 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x34, 0x38, 0x54, 0x30, 0x34, 0xF8, 0xC1, 0x20, 0x36, 0x20, 0x1F, 0x30, 0x36, 0xCF, 0x68, 0xA0, 
 0x37, 0xF6, 0xC6, 0xB0, 0x38, 0xB8, 0x85, 0x20, 0x39, 0xDF, 0xE3, 0x30, 0x3A, 0x8F, 0x2C, 0xA0, 
 0x3B, 0xC8, 0xFF, 0xB0, 0x3C, 0x6F, 0x0E, 0xA0, 0x3D, 0xC4, 0x91, 0x30, 0x3E, 0x4E, 0xF0, 0xA0, 
-0x50, 0x83, 0x65, 0x30, 0x51, 0x20, 0x39, 0xA0, 0x52, 0x63, 0x47, 0x30, 0x53, 0x00, 0x1B, 0xA0, 
-0x54, 0x43, 0x29, 0x30, 0x54, 0xE9, 0x38, 0x20, 0x56, 0x23, 0x0B, 0x30, 0x56, 0xC9, 0x1A, 0x20, 
-0x58, 0x02, 0xED, 0x30, 0x58, 0xA8, 0xFC, 0x20, 0x59, 0xE2, 0xCF, 0x30, 0x5A, 0x88, 0xDE, 0x20, 
-0x5B, 0xCB, 0xEB, 0xB0, 0x5C, 0x68, 0xC0, 0x20, 0x5D, 0xAB, 0xCD, 0xB0, 0x5E, 0x48, 0xA2, 0x20, 
-0x5F, 0x8B, 0xAF, 0xB0, 0x60, 0x31, 0xBE, 0xA0, 0x61, 0x6B, 0x91, 0xB0, 0x62, 0x11, 0xA0, 0xA0, 
-0x63, 0x4B, 0x73, 0xB0, 0x63, 0xFA, 0xBD, 0x20, 0x65, 0x2B, 0x55, 0xB0, 0x65, 0xD1, 0x64, 0xA0, 
-0x67, 0x14, 0x72, 0x30, 0x67, 0xB1, 0x46, 0xA0, 0x68, 0xF4, 0x54, 0x30, 0x69, 0x9A, 0x63, 0x20, 
-0x6A, 0xD4, 0x36, 0x30, 0x6B, 0x7A, 0x45, 0x20, 0x6C, 0xB4, 0x18, 0x30, 0x6D, 0x5A, 0x27, 0x20, 
-0x6E, 0x93, 0xFA, 0x30, 0x6F, 0x3A, 0x09, 0x20, 0x70, 0x7D, 0x16, 0xB0, 0x71, 0x19, 0xEB, 0x20, 
-0x72, 0x5C, 0xF8, 0xB0, 0x72, 0xF9, 0xCD, 0x20, 0x74, 0x3C, 0xDA, 0xB0, 0x74, 0xD9, 0xAF, 0x20, 
-0x76, 0x1C, 0xBC, 0xB0, 0x76, 0xC2, 0xCB, 0xA0, 0x77, 0xFC, 0x9E, 0xB0, 0x78, 0xAB, 0xE8, 0x20, 
-0x79, 0xDC, 0x80, 0xB0, 0x7A, 0x82, 0x8F, 0xA0, 0x7B, 0xC5, 0x9D, 0x30, 0x7C, 0x62, 0x71, 0xA0, 
-0x7D, 0xA5, 0x7F, 0x30, 0x7E, 0x4B, 0x8E, 0x20, 0x7F, 0x85, 0x61, 0x30, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
+0x50, 0x83, 0x65, 0x30, 0x51, 0x20, 0x39, 0xA0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0xFF, 0xFF, 0xD2, 0xD0, 0x00, 0x00, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 
-0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x42, 0x52, 0x53, 0x54, 0x00, 0x42, 0x52, 0x54, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x57, 0xC0, 0x00, 0xC9, 0x1C, 0x60, 0x00, 0x00, 0x00, 
-0x09, 0x54, 0x6F, 0x63, 0x61, 0x6E, 0x74, 0x69, 0x6E, 0x73, 
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xD2, 0xD0, 0x00, 
+0x00, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x09, 0x4C, 0x4D, 0x54, 
+0x00, 0x42, 0x52, 0x53, 0x54, 0x00, 0x42, 0x52, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x7E, 0x57, 0xC0, 0x00, 0xC9, 0x1C, 0x60, 0x00, 0x00, 0x00, 0x09, 0x54, 0x6F, 0x63, 0x61, 
+0x6E, 0x74, 0x69, 0x6E, 0x73, 
 
 /* America/Argentina/Buenos_Aires */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -1767,7 +1752,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x05, 
-0x06, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x03, 0x06, 0x05, 0x06, 0x05, 0x06, 0xFF, 0xFF, 0xC3, 
+0x06, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x03, 0x06, 0x05, 0x06, 0x05, 0x04, 0xFF, 0xFF, 0xC3, 
 0xD0, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x08, 0xFF, 
 0xFF, 0xE3, 0xE0, 0x01, 0x08, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 
 0x0D, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x12, 0x43, 0x4D, 0x54, 0x00, 0x41, 0x52, 0x54, 0x00, 0x41, 
@@ -1839,8 +1824,8 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/Aruba */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x57, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x93, 0x1E, 0x2F, 0x38, 
-0xF6, 0x98, 0xEC, 0x48, 0x01, 0x02, 0xFF, 0xFF, 0xBE, 0x48, 0x00, 0x00, 0xFF, 0xFF, 0xC0, 0xB8, 
+0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x93, 0x1E, 0x2E, 0x23, 
+0xF6, 0x98, 0xEC, 0x48, 0x01, 0x02, 0xFF, 0xFF, 0xBF, 0x5D, 0x00, 0x00, 0xFF, 0xFF, 0xC0, 0xB8, 
 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x4E, 0x54, 0x00, 
 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9C, 0x67, 0x10, 0x00, 0xA7, 
 0xE5, 0xC5, 0x00, 0x00, 0x00, 0x00, 
@@ -2414,8 +2399,8 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/Cayman */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4B, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x0F, 0xB5, 0x00, 
-0x01, 0xFF, 0xFF, 0xB8, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04, 0x4B, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x0F, 0xB4, 0xFF, 
+0x01, 0xFF, 0xFF, 0xB8, 0x01, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04, 0x4B, 0x4D, 0x54, 
 0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA6, 0xC7, 0x50, 0x00, 0x96, 0x7A, 
 0x22, 0x00, 0x00, 0x00, 0x00, 
 
@@ -2889,8 +2874,8 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/Dominica */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x44, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xF4, 0x34, 0x4C, 
-0x01, 0xFF, 0xFF, 0xC6, 0x70, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xAC, 0xD0, 0x00, 0xB4, 0xF8, 
 0x20, 0x00, 0x00, 0x00, 0x00, 
 
@@ -3292,7 +3277,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/Grand_Turk */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x54, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x93, 0x0F, 0xB5, 0x00, 
+0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x93, 0x0F, 0xB4, 0xFF, 
 0x11, 0x89, 0x65, 0xF0, 0x12, 0x79, 0x48, 0xE0, 0x13, 0x69, 0x47, 0xF0, 0x14, 0x59, 0x2A, 0xE0, 
 0x15, 0x49, 0x29, 0xF0, 0x16, 0x39, 0x0C, 0xE0, 0x17, 0x29, 0x0B, 0xF0, 0x18, 0x22, 0x29, 0x60, 
 0x19, 0x08, 0xED, 0xF0, 0x1A, 0x02, 0x0B, 0x60, 0x1A, 0xF2, 0x0A, 0x70, 0x1B, 0xE1, 0xED, 0x60, 
@@ -3330,23 +3315,23 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 
-0xFF, 0xB8, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 
+0xFF, 0xB8, 0x01, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 
 0x08, 0x4B, 0x4D, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0xAA, 0x15, 0xAA, 0x00, 0xA6, 0x1E, 0x0A, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/Grenada */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x47, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xF4, 0x34, 0x64, 
-0x01, 0xFF, 0xFF, 0xC6, 0x1C, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9B, 0xB7, 0x48, 0x00, 0xB4, 0x6F, 
 0x68, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/Guadeloupe */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x47, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xD5, 0xE1, 0xB0, 
-0x01, 0xFF, 0xFF, 0xC6, 0x50, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x19, 0x65, 0x00, 0xB4, 0xC4, 
 0x0A, 0x00, 0x00, 0x00, 0x00, 
 
@@ -4057,17 +4042,17 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/Jamaica */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4A, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x93, 0x0F, 0xB5, 0x00, 
+0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x93, 0x0F, 0xB4, 0xFF, 
 0x08, 0x20, 0xC1, 0x70, 0x09, 0x10, 0xA4, 0x60, 0x09, 0xAD, 0x94, 0xF0, 0x0A, 0xF0, 0x86, 0x60, 
 0x0B, 0xE0, 0x85, 0x70, 0x0C, 0xD9, 0xA2, 0xE0, 0x0D, 0xC0, 0x67, 0x70, 0x0E, 0xB9, 0x84, 0xE0, 
 0x0F, 0xA9, 0x83, 0xF0, 0x10, 0x99, 0x66, 0xE0, 0x11, 0x89, 0x65, 0xF0, 0x12, 0x79, 0x48, 0xE0, 
 0x13, 0x69, 0x47, 0xF0, 0x14, 0x59, 0x2A, 0xE0, 0x15, 0x49, 0x29, 0xF0, 0x16, 0x39, 0x0C, 0xE0, 
 0x17, 0x29, 0x0B, 0xF0, 0x18, 0x22, 0x29, 0x60, 0x19, 0x08, 0xED, 0xF0, 0x1A, 0x02, 0x0B, 0x60, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
-0x01, 0x02, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0xB8, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 
+0x01, 0x02, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0xB8, 0x01, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 
 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0x4B, 0x4D, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45, 
-0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xCB, 0x80, 0x00, 0x9D, 0x78, 
-0x80, 0x00, 0x00, 0x00, 0x00, 
+0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xBF, 0x05, 0x00, 0x9D, 0x7B, 
+0x1A, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/Jujuy */
 0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -4573,8 +4558,8 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/Marigot */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xD5, 0xE1, 0xB0, 
-0x01, 0xFF, 0xFF, 0xC6, 0x50, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xE5, 0x8A, 0x00, 0xB2, 0x66, 
 0x92, 0x00, 0x00, 0x00, 0x00, 
 
@@ -5071,7 +5056,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x00, 0x00, 
 
 /* America/Montreal */
-0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x9C, 0xBD, 0x01, 0xF0, 
 0x9C, 0xE4, 0x64, 0xC0, 0x9E, 0xB8, 0x93, 0x70, 0x9F, 0xBA, 0xEB, 0x60, 0xA0, 0x87, 0x58, 0xF8, 
@@ -5149,16 +5134,14 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04, 
 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0x45, 0x44, 0x54, 0x00, 
 0x45, 0x53, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x45, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0xCE, 0xC8, 0x32, 0x00, 0xA2, 0x67, 0x85, 0x00, 0x00, 0x00, 0x26, 
-0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x51, 
-0x75, 0x65, 0x62, 0x65, 0x63, 0x20, 0x2D, 0x20, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F, 0x63, 
-0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, 
+
 
 /* America/Montserrat */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xF4, 0x35, 0x10, 
-0x01, 0xFF, 0xFF, 0xC5, 0xAC, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0xD6, 0x32, 0x00, 0xB3, 0xB9, 
 0x1D, 0x00, 0x00, 0x00, 0x00, 
 
@@ -5741,9 +5724,10 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0xFB, 0xE8, 0x58, 0x00, 0x00, 0x01, 0x00, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x01, 0xFF, 0xFF, 
 0xAB, 0xA0, 0x01, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08, 
 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0xBC, 0x5E, 0x01, 0x00, 0x67, 0xA5, 0xDA, 0x00, 0x00, 0x00, 0x20, 0x4D, 0x6F, 
+0x00, 0x00, 0x00, 0xBC, 0x5E, 0x01, 0x00, 0x67, 0xA5, 0xDA, 0x00, 0x00, 0x00, 0x30, 0x4D, 0x6F, 
 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x53, 0x74, 0x61, 0x6E, 0x64, 0x61, 0x72, 0x64, 0x20, 
-0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x41, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x61, 
+0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x41, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x61, 0x20, 0x28, 
+0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x20, 0x4E, 0x61, 0x76, 0x61, 0x6A, 0x6F, 0x29, 
 
 /* America/Port-au-Prince */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x48, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -6344,7 +6328,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x74, 0x6F, 0x71, 0x71, 0x6F, 0x72, 0x74, 0x6F, 0x6F, 0x72, 0x6D, 0x69, 0x69, 0x74, 
 
 /* America/Shiprock */
-0x50, 0x48, 0x50, 0x31, 0x01, 0x55, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x9D, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x9E, 0xA6, 0x3A, 0x90, 
 0x9F, 0xBB, 0x07, 0x80, 0xA0, 0x86, 0x1C, 0x90, 0xA1, 0x9A, 0xE9, 0x80, 0xA2, 0x65, 0xFE, 0x90, 
@@ -6398,9 +6382,8 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0xAB, 
 0xA0, 0x01, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08, 0xFF, 
 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 
-0x00, 0x4D, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xC1, 0x75, 
-0x9B, 0x00, 0x6C, 0xD0, 0xE1, 0x00, 0x00, 0x00, 0x16, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 
-0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x4E, 0x61, 0x76, 0x61, 0x6A, 0x6F, 
+0x00, 0x4D, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x89, 0x54, 
+0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/Sitka */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x55, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -6464,8 +6447,8 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/St_Barthelemy */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x42, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xD5, 0xE1, 0xB0, 
-0x01, 0xFF, 0xFF, 0xC6, 0x50, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0x9D, 0xED, 0x00, 0xB2, 0xC1, 
 0xB8, 0x00, 0x00, 0x00, 0x00, 
 
@@ -6560,32 +6543,32 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/St_Kitts */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4B, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x34, 0xCC, 
-0x01, 0xFF, 0xFF, 0xC5, 0x34, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA3, 0xBA, 0x10, 0x00, 0xB2, 0xF5, 
 0xCD, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/St_Lucia */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4C, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x92, 0xE6, 0xC7, 0xB0, 
-0x01, 0xFF, 0xFF, 0xC6, 0xD0, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x43, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0xB7, 0x82, 0x00, 0xB5, 0x94, 
 0x60, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/St_Thomas */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x56, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xF4, 0x37, 0x60, 
-0x01, 0xFF, 0xFF, 0xC3, 0x20, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA5, 0x54, 0x38, 0x00, 0xAF, 0x93, 
 0xEA, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/St_Vincent */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x56, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x92, 0xE6, 0xC7, 0xE8, 
-0x01, 0xFF, 0xFF, 0xC6, 0x98, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4B, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9D, 0x64, 0xF8, 0x00, 0xB5, 0x39, 
 0x3A, 0x00, 0x00, 0x00, 0x00, 
 
@@ -6853,16 +6836,17 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04, 
 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0x45, 0x44, 0x54, 0x00, 
 0x45, 0x53, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x45, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0xCB, 0xEF, 0x08, 0x00, 0x99, 0x87, 0x62, 0x00, 0x00, 0x00, 0x27, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0xCB, 0xEF, 0x08, 0x00, 0x99, 0x87, 0x62, 0x00, 0x00, 0x00, 0x30, 
 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x4F, 
-0x6E, 0x74, 0x61, 0x72, 0x69, 0x6F, 0x20, 0x2D, 0x20, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F, 
-0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73, 
+0x6E, 0x74, 0x61, 0x72, 0x69, 0x6F, 0x20, 0x26, 0x20, 0x51, 0x75, 0x65, 0x62, 0x65, 0x63, 0x20, 
+0x2D, 0x20, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73, 
+
 
 /* America/Tortola */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x56, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xF4, 0x37, 0x14, 
-0x01, 0xFF, 0xFF, 0xC3, 0x6C, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA5, 0x7B, 0x48, 0x00, 0xB0, 0x0F, 
 0x9D, 0x00, 0x00, 0x00, 0x00, 
 
@@ -6939,8 +6923,8 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/Virgin */
 0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xF4, 0x37, 0x60, 
-0x01, 0xFF, 0xFF, 0xC3, 0x20, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 
 0x80, 0x00, 0x00, 0x00, 0x00, 
 
@@ -7248,7 +7232,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x8C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xB0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 
 0x00, 0x00, 0x9A, 0xB0, 0x01, 0x00, 0x00, 0x00, 0x8C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xB0, 
 0x00, 0x08, 0x45, 0x53, 0x54, 0x00, 0x7A, 0x7A, 0x7A, 0x00, 0x4D, 0x49, 0x53, 0x54, 0x00, 0x00, 
-0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x2B, 0x30, 0x02, 
+0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x2B, 0x30, 0x02, 
 0x05, 0x32, 0x58, 0x00, 0x00, 0x00, 0x10, 0x4D, 0x61, 0x63, 0x71, 0x75, 0x61, 0x72, 0x69, 0x65, 
 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 
 
@@ -7264,54 +7248,64 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 
 /* Antarctica/McMurdo */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0E, 0xE5, 0xA9, 0xE9, 0x00, 
-0x09, 0x18, 0xFD, 0xE0, 0x09, 0xAC, 0xA5, 0xE0, 0x0A, 0xEF, 0xA5, 0x60, 0x0B, 0x9E, 0xFC, 0xE0, 
-0x0C, 0xD8, 0xC1, 0xE0, 0x0D, 0x7E, 0xDE, 0xE0, 0x0E, 0xB8, 0xA3, 0xE0, 0x0F, 0x5E, 0xC0, 0xE0, 
-0x10, 0x98, 0x85, 0xE0, 0x11, 0x3E, 0xA2, 0xE0, 0x12, 0x78, 0x67, 0xE0, 0x13, 0x1E, 0x84, 0xE0, 
-0x14, 0x58, 0x49, 0xE0, 0x14, 0xFE, 0x66, 0xE0, 0x16, 0x38, 0x2B, 0xE0, 0x16, 0xE7, 0x83, 0x60, 
-0x18, 0x21, 0x48, 0x60, 0x18, 0xC7, 0x65, 0x60, 0x1A, 0x01, 0x2A, 0x60, 0x1A, 0xA7, 0x47, 0x60, 
-0x1B, 0xE1, 0x0C, 0x60, 0x1C, 0x87, 0x29, 0x60, 0x1D, 0xC0, 0xEE, 0x60, 0x1E, 0x67, 0x0B, 0x60, 
-0x1F, 0xA0, 0xD0, 0x60, 0x20, 0x46, 0xED, 0x60, 0x21, 0x80, 0xB2, 0x60, 0x22, 0x30, 0x09, 0xE0, 
-0x23, 0x69, 0xCE, 0xE0, 0x24, 0x0F, 0xEB, 0xE0, 0x25, 0x2E, 0x01, 0x60, 0x26, 0x02, 0x42, 0xE0, 
-0x27, 0x0D, 0xE3, 0x60, 0x27, 0xE2, 0x24, 0xE0, 0x28, 0xED, 0xC5, 0x60, 0x29, 0xC2, 0x06, 0xE0, 
-0x2A, 0xCD, 0xA7, 0x60, 0x2B, 0xAB, 0x23, 0x60, 0x2C, 0xAD, 0x89, 0x60, 0x2D, 0x8B, 0x05, 0x60, 
-0x2E, 0x8D, 0x6B, 0x60, 0x2F, 0x6A, 0xE7, 0x60, 0x30, 0x6D, 0x4D, 0x60, 0x31, 0x4A, 0xC9, 0x60, 
-0x32, 0x56, 0x69, 0xE0, 0x33, 0x2A, 0xAB, 0x60, 0x34, 0x36, 0x4B, 0xE0, 0x35, 0x0A, 0x8D, 0x60, 
-0x36, 0x16, 0x2D, 0xE0, 0x36, 0xF3, 0xA9, 0xE0, 0x37, 0xF6, 0x0F, 0xE0, 0x38, 0xD3, 0x8B, 0xE0, 
-0x39, 0xD5, 0xF1, 0xE0, 0x3A, 0xB3, 0x6D, 0xE0, 0x3B, 0xBF, 0x0E, 0x60, 0x3C, 0x93, 0x4F, 0xE0, 
-0x3D, 0x9E, 0xF0, 0x60, 0x3E, 0x73, 0x31, 0xE0, 0x3F, 0x7E, 0xD2, 0x60, 0x40, 0x5C, 0x4E, 0x60, 
-0x41, 0x5E, 0xB4, 0x60, 0x42, 0x3C, 0x30, 0x60, 0x43, 0x3E, 0x96, 0x60, 0x44, 0x1C, 0x12, 0x60, 
-0x45, 0x1E, 0x78, 0x60, 0x45, 0xFB, 0xF4, 0x60, 0x46, 0xFE, 0x5A, 0x60, 0x47, 0xF7, 0x85, 0xE0, 
-0x48, 0xDE, 0x3C, 0x60, 0x49, 0xD7, 0x67, 0xE0, 0x4A, 0xBE, 0x1E, 0x60, 0x4B, 0xB7, 0x49, 0xE0, 
-0x4C, 0x9E, 0x00, 0x60, 0x4D, 0x97, 0x2B, 0xE0, 0x4E, 0x7D, 0xE2, 0x60, 0x4F, 0x77, 0x0D, 0xE0, 
-0x50, 0x66, 0xFE, 0xE0, 0x51, 0x60, 0x2A, 0x60, 0x52, 0x46, 0xE0, 0xE0, 0x53, 0x40, 0x0C, 0x60, 
-0x54, 0x26, 0xC2, 0xE0, 0x55, 0x1F, 0xEE, 0x60, 0x56, 0x06, 0xA4, 0xE0, 0x56, 0xFF, 0xD0, 0x60, 
-0x57, 0xE6, 0x86, 0xE0, 0x58, 0xDF, 0xB2, 0x60, 0x59, 0xC6, 0x68, 0xE0, 0x5A, 0xBF, 0x94, 0x60, 
-0x5B, 0xAF, 0x85, 0x60, 0x5C, 0xA8, 0xB0, 0xE0, 0x5D, 0x8F, 0x67, 0x60, 0x5E, 0x88, 0x92, 0xE0, 
-0x5F, 0x6F, 0x49, 0x60, 0x60, 0x68, 0x74, 0xE0, 0x61, 0x4F, 0x2B, 0x60, 0x62, 0x48, 0x56, 0xE0, 
-0x63, 0x2F, 0x0D, 0x60, 0x64, 0x28, 0x38, 0xE0, 0x65, 0x0E, 0xEF, 0x60, 0x66, 0x11, 0x55, 0x60, 
-0x66, 0xF8, 0x0B, 0xE0, 0x67, 0xF1, 0x37, 0x60, 0x68, 0xD7, 0xED, 0xE0, 0x69, 0xD1, 0x19, 0x60, 
-0x6A, 0xB7, 0xCF, 0xE0, 0x6B, 0xB0, 0xFB, 0x60, 0x6C, 0x97, 0xB1, 0xE0, 0x6D, 0x90, 0xDD, 0x60, 
-0x6E, 0x77, 0x93, 0xE0, 0x6F, 0x70, 0xBF, 0x60, 0x70, 0x60, 0xB0, 0x60, 0x71, 0x59, 0xDB, 0xE0, 
-0x72, 0x40, 0x92, 0x60, 0x73, 0x39, 0xBD, 0xE0, 0x74, 0x20, 0x74, 0x60, 0x75, 0x19, 0x9F, 0xE0, 
-0x76, 0x00, 0x56, 0x60, 0x76, 0xF9, 0x81, 0xE0, 0x77, 0xE0, 0x38, 0x60, 0x78, 0xD9, 0x63, 0xE0, 
-0x79, 0xC0, 0x1A, 0x60, 0x7A, 0xB9, 0x45, 0xE0, 0x7B, 0xA9, 0x36, 0xE0, 0x7C, 0xA2, 0x62, 0x60, 
-0x7D, 0x89, 0x18, 0xE0, 0x7E, 0x82, 0x44, 0x60, 0x7F, 0x68, 0xFA, 0xE0, 0x03, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x9B, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0F, 0xB0, 0xB4, 0xB2, 0xE8, 
+0xB1, 0x51, 0x87, 0x58, 0xB2, 0x78, 0xE5, 0x68, 0xB3, 0x43, 0xE5, 0x60, 0xB4, 0x58, 0xC7, 0x68, 
+0xB5, 0x23, 0xC7, 0x60, 0xB6, 0x38, 0xA9, 0x68, 0xB7, 0x03, 0xA9, 0x60, 0xB8, 0x18, 0x8B, 0x68, 
+0xB8, 0xEC, 0xC5, 0xE0, 0xB9, 0xF8, 0x6D, 0x68, 0xBA, 0xCC, 0xA7, 0xE0, 0xBB, 0xD8, 0x4F, 0x68, 
+0xBC, 0xE3, 0xE8, 0xE0, 0xBD, 0xAE, 0xF6, 0xE8, 0xBE, 0xC3, 0xCA, 0xE0, 0xBF, 0x8E, 0xD8, 0xE8, 
+0xC0, 0xA3, 0xAC, 0xE0, 0xC1, 0x6E, 0xBA, 0xE8, 0xC2, 0x83, 0x8E, 0xE0, 0xC3, 0x4E, 0x9C, 0xE8, 
+0xC4, 0x63, 0x70, 0xE0, 0xC5, 0x2E, 0x7E, 0xE8, 0xC6, 0x4C, 0x8D, 0x60, 0xC7, 0x0E, 0x60, 0xE8, 
+0xC8, 0x2C, 0x6F, 0x60, 0xC8, 0xF7, 0x7D, 0x68, 0xD2, 0xDA, 0x9A, 0x40, 0x09, 0x18, 0xFD, 0xE0, 
+0x09, 0xAC, 0xA5, 0xE0, 0x0A, 0xEF, 0xA5, 0x60, 0x0B, 0x9E, 0xFC, 0xE0, 0x0C, 0xD8, 0xC1, 0xE0, 
+0x0D, 0x7E, 0xDE, 0xE0, 0x0E, 0xB8, 0xA3, 0xE0, 0x0F, 0x5E, 0xC0, 0xE0, 0x10, 0x98, 0x85, 0xE0, 
+0x11, 0x3E, 0xA2, 0xE0, 0x12, 0x78, 0x67, 0xE0, 0x13, 0x1E, 0x84, 0xE0, 0x14, 0x58, 0x49, 0xE0, 
+0x14, 0xFE, 0x66, 0xE0, 0x16, 0x38, 0x2B, 0xE0, 0x16, 0xE7, 0x83, 0x60, 0x18, 0x21, 0x48, 0x60, 
+0x18, 0xC7, 0x65, 0x60, 0x1A, 0x01, 0x2A, 0x60, 0x1A, 0xA7, 0x47, 0x60, 0x1B, 0xE1, 0x0C, 0x60, 
+0x1C, 0x87, 0x29, 0x60, 0x1D, 0xC0, 0xEE, 0x60, 0x1E, 0x67, 0x0B, 0x60, 0x1F, 0xA0, 0xD0, 0x60, 
+0x20, 0x46, 0xED, 0x60, 0x21, 0x80, 0xB2, 0x60, 0x22, 0x30, 0x09, 0xE0, 0x23, 0x69, 0xCE, 0xE0, 
+0x24, 0x0F, 0xEB, 0xE0, 0x25, 0x2E, 0x01, 0x60, 0x26, 0x02, 0x42, 0xE0, 0x27, 0x0D, 0xE3, 0x60, 
+0x27, 0xE2, 0x24, 0xE0, 0x28, 0xED, 0xC5, 0x60, 0x29, 0xC2, 0x06, 0xE0, 0x2A, 0xCD, 0xA7, 0x60, 
+0x2B, 0xAB, 0x23, 0x60, 0x2C, 0xAD, 0x89, 0x60, 0x2D, 0x8B, 0x05, 0x60, 0x2E, 0x8D, 0x6B, 0x60, 
+0x2F, 0x6A, 0xE7, 0x60, 0x30, 0x6D, 0x4D, 0x60, 0x31, 0x4A, 0xC9, 0x60, 0x32, 0x56, 0x69, 0xE0, 
+0x33, 0x2A, 0xAB, 0x60, 0x34, 0x36, 0x4B, 0xE0, 0x35, 0x0A, 0x8D, 0x60, 0x36, 0x16, 0x2D, 0xE0, 
+0x36, 0xF3, 0xA9, 0xE0, 0x37, 0xF6, 0x0F, 0xE0, 0x38, 0xD3, 0x8B, 0xE0, 0x39, 0xD5, 0xF1, 0xE0, 
+0x3A, 0xB3, 0x6D, 0xE0, 0x3B, 0xBF, 0x0E, 0x60, 0x3C, 0x93, 0x4F, 0xE0, 0x3D, 0x9E, 0xF0, 0x60, 
+0x3E, 0x73, 0x31, 0xE0, 0x3F, 0x7E, 0xD2, 0x60, 0x40, 0x5C, 0x4E, 0x60, 0x41, 0x5E, 0xB4, 0x60, 
+0x42, 0x3C, 0x30, 0x60, 0x43, 0x3E, 0x96, 0x60, 0x44, 0x1C, 0x12, 0x60, 0x45, 0x1E, 0x78, 0x60, 
+0x45, 0xFB, 0xF4, 0x60, 0x46, 0xFE, 0x5A, 0x60, 0x47, 0xF7, 0x85, 0xE0, 0x48, 0xDE, 0x3C, 0x60, 
+0x49, 0xD7, 0x67, 0xE0, 0x4A, 0xBE, 0x1E, 0x60, 0x4B, 0xB7, 0x49, 0xE0, 0x4C, 0x9E, 0x00, 0x60, 
+0x4D, 0x97, 0x2B, 0xE0, 0x4E, 0x7D, 0xE2, 0x60, 0x4F, 0x77, 0x0D, 0xE0, 0x50, 0x66, 0xFE, 0xE0, 
+0x51, 0x60, 0x2A, 0x60, 0x52, 0x46, 0xE0, 0xE0, 0x53, 0x40, 0x0C, 0x60, 0x54, 0x26, 0xC2, 0xE0, 
+0x55, 0x1F, 0xEE, 0x60, 0x56, 0x06, 0xA4, 0xE0, 0x56, 0xFF, 0xD0, 0x60, 0x57, 0xE6, 0x86, 0xE0, 
+0x58, 0xDF, 0xB2, 0x60, 0x59, 0xC6, 0x68, 0xE0, 0x5A, 0xBF, 0x94, 0x60, 0x5B, 0xAF, 0x85, 0x60, 
+0x5C, 0xA8, 0xB0, 0xE0, 0x5D, 0x8F, 0x67, 0x60, 0x5E, 0x88, 0x92, 0xE0, 0x5F, 0x6F, 0x49, 0x60, 
+0x60, 0x68, 0x74, 0xE0, 0x61, 0x4F, 0x2B, 0x60, 0x62, 0x48, 0x56, 0xE0, 0x63, 0x2F, 0x0D, 0x60, 
+0x64, 0x28, 0x38, 0xE0, 0x65, 0x0E, 0xEF, 0x60, 0x66, 0x11, 0x55, 0x60, 0x66, 0xF8, 0x0B, 0xE0, 
+0x67, 0xF1, 0x37, 0x60, 0x68, 0xD7, 0xED, 0xE0, 0x69, 0xD1, 0x19, 0x60, 0x6A, 0xB7, 0xCF, 0xE0, 
+0x6B, 0xB0, 0xFB, 0x60, 0x6C, 0x97, 0xB1, 0xE0, 0x6D, 0x90, 0xDD, 0x60, 0x6E, 0x77, 0x93, 0xE0, 
+0x6F, 0x70, 0xBF, 0x60, 0x70, 0x60, 0xB0, 0x60, 0x71, 0x59, 0xDB, 0xE0, 0x72, 0x40, 0x92, 0x60, 
+0x73, 0x39, 0xBD, 0xE0, 0x74, 0x20, 0x74, 0x60, 0x75, 0x19, 0x9F, 0xE0, 0x76, 0x00, 0x56, 0x60, 
+0x76, 0xF9, 0x81, 0xE0, 0x77, 0xE0, 0x38, 0x60, 0x78, 0xD9, 0x63, 0xE0, 0x79, 0xC0, 0x1A, 0x60, 
+0x7A, 0xB9, 0x45, 0xE0, 0x7B, 0xA9, 0x36, 0xE0, 0x7C, 0xA2, 0x62, 0x60, 0x7D, 0x89, 0x18, 0xE0, 
+0x7E, 0x82, 0x44, 0x60, 0x7F, 0x68, 0xFA, 0xE0, 0x00, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xB6, 0xD0, 0x01, 0x04, 0x00, 0x00, 0xA8, 0xC0, 0x00, 0x09, 0x00, 0x00, 
-0xA8, 0xC0, 0x00, 0x09, 0x7A, 0x7A, 0x7A, 0x00, 0x4E, 0x5A, 0x44, 0x54, 0x00, 0x4E, 0x5A, 0x53, 
-0x54, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x90, 0x9A, 0x02, 0x10, 
-0xDE, 0xA0, 0x00, 0x00, 0x00, 0x1C, 0x4D, 0x63, 0x4D, 0x75, 0x72, 0x64, 0x6F, 0x20, 0x53, 0x74, 
-0x61, 0x74, 0x69, 0x6F, 0x6E, 0x2C, 0x20, 0x52, 0x6F, 0x73, 0x73, 0x20, 0x49, 0x73, 0x6C, 0x61, 
-0x6E, 0x64, 
+0x02, 0x01, 0x02, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x00, 0x00, 0xAF, 0xC8, 0x01, 0x00, 0x00, 0x00, 0xA1, 0xB8, 0x00, 0x05, 0x00, 
+0x00, 0xA8, 0xC0, 0x01, 0x00, 0x00, 0x00, 0xB6, 0xD0, 0x01, 0x0A, 0x00, 0x00, 0xA8, 0xC0, 0x00, 
+0x00, 0x00, 0x00, 0xA8, 0xC0, 0x00, 0x00, 0x4E, 0x5A, 0x53, 0x54, 0x00, 0x4E, 0x5A, 0x4D, 0x54, 
+0x00, 0x4E, 0x5A, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x12, 0x90, 0x9A, 0x02, 0x10, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x2D, 0x4D, 0x63, 
+0x4D, 0x75, 0x72, 0x64, 0x6F, 0x2C, 0x20, 0x53, 0x6F, 0x75, 0x74, 0x68, 0x20, 0x50, 0x6F, 0x6C, 
+0x65, 0x2C, 0x20, 0x53, 0x63, 0x6F, 0x74, 0x74, 0x20, 0x28, 0x4E, 0x65, 0x77, 0x20, 0x5A, 0x65, 
+0x61, 0x6C, 0x61, 0x6E, 0x64, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x29, 
 
 /* Antarctica/Palmer */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -7376,55 +7370,62 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 
 
 /* Antarctica/South_Pole */
-0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0E, 0xE5, 0xA9, 0xE9, 0x00, 
-0x09, 0x18, 0xFD, 0xE0, 0x09, 0xAC, 0xA5, 0xE0, 0x0A, 0xEF, 0xA5, 0x60, 0x0B, 0x9E, 0xFC, 0xE0, 
-0x0C, 0xD8, 0xC1, 0xE0, 0x0D, 0x7E, 0xDE, 0xE0, 0x0E, 0xB8, 0xA3, 0xE0, 0x0F, 0x5E, 0xC0, 0xE0, 
-0x10, 0x98, 0x85, 0xE0, 0x11, 0x3E, 0xA2, 0xE0, 0x12, 0x78, 0x67, 0xE0, 0x13, 0x1E, 0x84, 0xE0, 
-0x14, 0x58, 0x49, 0xE0, 0x14, 0xFE, 0x66, 0xE0, 0x16, 0x38, 0x2B, 0xE0, 0x16, 0xE7, 0x83, 0x60, 
-0x18, 0x21, 0x48, 0x60, 0x18, 0xC7, 0x65, 0x60, 0x1A, 0x01, 0x2A, 0x60, 0x1A, 0xA7, 0x47, 0x60, 
-0x1B, 0xE1, 0x0C, 0x60, 0x1C, 0x87, 0x29, 0x60, 0x1D, 0xC0, 0xEE, 0x60, 0x1E, 0x67, 0x0B, 0x60, 
-0x1F, 0xA0, 0xD0, 0x60, 0x20, 0x46, 0xED, 0x60, 0x21, 0x80, 0xB2, 0x60, 0x22, 0x30, 0x09, 0xE0, 
-0x23, 0x69, 0xCE, 0xE0, 0x24, 0x0F, 0xEB, 0xE0, 0x25, 0x2E, 0x01, 0x60, 0x26, 0x02, 0x42, 0xE0, 
-0x27, 0x0D, 0xE3, 0x60, 0x27, 0xE2, 0x24, 0xE0, 0x28, 0xED, 0xC5, 0x60, 0x29, 0xC2, 0x06, 0xE0, 
-0x2A, 0xCD, 0xA7, 0x60, 0x2B, 0xAB, 0x23, 0x60, 0x2C, 0xAD, 0x89, 0x60, 0x2D, 0x8B, 0x05, 0x60, 
-0x2E, 0x8D, 0x6B, 0x60, 0x2F, 0x6A, 0xE7, 0x60, 0x30, 0x6D, 0x4D, 0x60, 0x31, 0x4A, 0xC9, 0x60, 
-0x32, 0x56, 0x69, 0xE0, 0x33, 0x2A, 0xAB, 0x60, 0x34, 0x36, 0x4B, 0xE0, 0x35, 0x0A, 0x8D, 0x60, 
-0x36, 0x16, 0x2D, 0xE0, 0x36, 0xF3, 0xA9, 0xE0, 0x37, 0xF6, 0x0F, 0xE0, 0x38, 0xD3, 0x8B, 0xE0, 
-0x39, 0xD5, 0xF1, 0xE0, 0x3A, 0xB3, 0x6D, 0xE0, 0x3B, 0xBF, 0x0E, 0x60, 0x3C, 0x93, 0x4F, 0xE0, 
-0x3D, 0x9E, 0xF0, 0x60, 0x3E, 0x73, 0x31, 0xE0, 0x3F, 0x7E, 0xD2, 0x60, 0x40, 0x5C, 0x4E, 0x60, 
-0x41, 0x5E, 0xB4, 0x60, 0x42, 0x3C, 0x30, 0x60, 0x43, 0x3E, 0x96, 0x60, 0x44, 0x1C, 0x12, 0x60, 
-0x45, 0x1E, 0x78, 0x60, 0x45, 0xFB, 0xF4, 0x60, 0x46, 0xFE, 0x5A, 0x60, 0x47, 0xF7, 0x85, 0xE0, 
-0x48, 0xDE, 0x3C, 0x60, 0x49, 0xD7, 0x67, 0xE0, 0x4A, 0xBE, 0x1E, 0x60, 0x4B, 0xB7, 0x49, 0xE0, 
-0x4C, 0x9E, 0x00, 0x60, 0x4D, 0x97, 0x2B, 0xE0, 0x4E, 0x7D, 0xE2, 0x60, 0x4F, 0x77, 0x0D, 0xE0, 
-0x50, 0x66, 0xFE, 0xE0, 0x51, 0x60, 0x2A, 0x60, 0x52, 0x46, 0xE0, 0xE0, 0x53, 0x40, 0x0C, 0x60, 
-0x54, 0x26, 0xC2, 0xE0, 0x55, 0x1F, 0xEE, 0x60, 0x56, 0x06, 0xA4, 0xE0, 0x56, 0xFF, 0xD0, 0x60, 
-0x57, 0xE6, 0x86, 0xE0, 0x58, 0xDF, 0xB2, 0x60, 0x59, 0xC6, 0x68, 0xE0, 0x5A, 0xBF, 0x94, 0x60, 
-0x5B, 0xAF, 0x85, 0x60, 0x5C, 0xA8, 0xB0, 0xE0, 0x5D, 0x8F, 0x67, 0x60, 0x5E, 0x88, 0x92, 0xE0, 
-0x5F, 0x6F, 0x49, 0x60, 0x60, 0x68, 0x74, 0xE0, 0x61, 0x4F, 0x2B, 0x60, 0x62, 0x48, 0x56, 0xE0, 
-0x63, 0x2F, 0x0D, 0x60, 0x64, 0x28, 0x38, 0xE0, 0x65, 0x0E, 0xEF, 0x60, 0x66, 0x11, 0x55, 0x60, 
-0x66, 0xF8, 0x0B, 0xE0, 0x67, 0xF1, 0x37, 0x60, 0x68, 0xD7, 0xED, 0xE0, 0x69, 0xD1, 0x19, 0x60, 
-0x6A, 0xB7, 0xCF, 0xE0, 0x6B, 0xB0, 0xFB, 0x60, 0x6C, 0x97, 0xB1, 0xE0, 0x6D, 0x90, 0xDD, 0x60, 
-0x6E, 0x77, 0x93, 0xE0, 0x6F, 0x70, 0xBF, 0x60, 0x70, 0x60, 0xB0, 0x60, 0x71, 0x59, 0xDB, 0xE0, 
-0x72, 0x40, 0x92, 0x60, 0x73, 0x39, 0xBD, 0xE0, 0x74, 0x20, 0x74, 0x60, 0x75, 0x19, 0x9F, 0xE0, 
-0x76, 0x00, 0x56, 0x60, 0x76, 0xF9, 0x81, 0xE0, 0x77, 0xE0, 0x38, 0x60, 0x78, 0xD9, 0x63, 0xE0, 
-0x79, 0xC0, 0x1A, 0x60, 0x7A, 0xB9, 0x45, 0xE0, 0x7B, 0xA9, 0x36, 0xE0, 0x7C, 0xA2, 0x62, 0x60, 
-0x7D, 0x89, 0x18, 0xE0, 0x7E, 0x82, 0x44, 0x60, 0x7F, 0x68, 0xFA, 0xE0, 0x03, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
+0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x9B, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0F, 0xB0, 0xB4, 0xB2, 0xE8, 
+0xB1, 0x51, 0x87, 0x58, 0xB2, 0x78, 0xE5, 0x68, 0xB3, 0x43, 0xE5, 0x60, 0xB4, 0x58, 0xC7, 0x68, 
+0xB5, 0x23, 0xC7, 0x60, 0xB6, 0x38, 0xA9, 0x68, 0xB7, 0x03, 0xA9, 0x60, 0xB8, 0x18, 0x8B, 0x68, 
+0xB8, 0xEC, 0xC5, 0xE0, 0xB9, 0xF8, 0x6D, 0x68, 0xBA, 0xCC, 0xA7, 0xE0, 0xBB, 0xD8, 0x4F, 0x68, 
+0xBC, 0xE3, 0xE8, 0xE0, 0xBD, 0xAE, 0xF6, 0xE8, 0xBE, 0xC3, 0xCA, 0xE0, 0xBF, 0x8E, 0xD8, 0xE8, 
+0xC0, 0xA3, 0xAC, 0xE0, 0xC1, 0x6E, 0xBA, 0xE8, 0xC2, 0x83, 0x8E, 0xE0, 0xC3, 0x4E, 0x9C, 0xE8, 
+0xC4, 0x63, 0x70, 0xE0, 0xC5, 0x2E, 0x7E, 0xE8, 0xC6, 0x4C, 0x8D, 0x60, 0xC7, 0x0E, 0x60, 0xE8, 
+0xC8, 0x2C, 0x6F, 0x60, 0xC8, 0xF7, 0x7D, 0x68, 0xD2, 0xDA, 0x9A, 0x40, 0x09, 0x18, 0xFD, 0xE0, 
+0x09, 0xAC, 0xA5, 0xE0, 0x0A, 0xEF, 0xA5, 0x60, 0x0B, 0x9E, 0xFC, 0xE0, 0x0C, 0xD8, 0xC1, 0xE0, 
+0x0D, 0x7E, 0xDE, 0xE0, 0x0E, 0xB8, 0xA3, 0xE0, 0x0F, 0x5E, 0xC0, 0xE0, 0x10, 0x98, 0x85, 0xE0, 
+0x11, 0x3E, 0xA2, 0xE0, 0x12, 0x78, 0x67, 0xE0, 0x13, 0x1E, 0x84, 0xE0, 0x14, 0x58, 0x49, 0xE0, 
+0x14, 0xFE, 0x66, 0xE0, 0x16, 0x38, 0x2B, 0xE0, 0x16, 0xE7, 0x83, 0x60, 0x18, 0x21, 0x48, 0x60, 
+0x18, 0xC7, 0x65, 0x60, 0x1A, 0x01, 0x2A, 0x60, 0x1A, 0xA7, 0x47, 0x60, 0x1B, 0xE1, 0x0C, 0x60, 
+0x1C, 0x87, 0x29, 0x60, 0x1D, 0xC0, 0xEE, 0x60, 0x1E, 0x67, 0x0B, 0x60, 0x1F, 0xA0, 0xD0, 0x60, 
+0x20, 0x46, 0xED, 0x60, 0x21, 0x80, 0xB2, 0x60, 0x22, 0x30, 0x09, 0xE0, 0x23, 0x69, 0xCE, 0xE0, 
+0x24, 0x0F, 0xEB, 0xE0, 0x25, 0x2E, 0x01, 0x60, 0x26, 0x02, 0x42, 0xE0, 0x27, 0x0D, 0xE3, 0x60, 
+0x27, 0xE2, 0x24, 0xE0, 0x28, 0xED, 0xC5, 0x60, 0x29, 0xC2, 0x06, 0xE0, 0x2A, 0xCD, 0xA7, 0x60, 
+0x2B, 0xAB, 0x23, 0x60, 0x2C, 0xAD, 0x89, 0x60, 0x2D, 0x8B, 0x05, 0x60, 0x2E, 0x8D, 0x6B, 0x60, 
+0x2F, 0x6A, 0xE7, 0x60, 0x30, 0x6D, 0x4D, 0x60, 0x31, 0x4A, 0xC9, 0x60, 0x32, 0x56, 0x69, 0xE0, 
+0x33, 0x2A, 0xAB, 0x60, 0x34, 0x36, 0x4B, 0xE0, 0x35, 0x0A, 0x8D, 0x60, 0x36, 0x16, 0x2D, 0xE0, 
+0x36, 0xF3, 0xA9, 0xE0, 0x37, 0xF6, 0x0F, 0xE0, 0x38, 0xD3, 0x8B, 0xE0, 0x39, 0xD5, 0xF1, 0xE0, 
+0x3A, 0xB3, 0x6D, 0xE0, 0x3B, 0xBF, 0x0E, 0x60, 0x3C, 0x93, 0x4F, 0xE0, 0x3D, 0x9E, 0xF0, 0x60, 
+0x3E, 0x73, 0x31, 0xE0, 0x3F, 0x7E, 0xD2, 0x60, 0x40, 0x5C, 0x4E, 0x60, 0x41, 0x5E, 0xB4, 0x60, 
+0x42, 0x3C, 0x30, 0x60, 0x43, 0x3E, 0x96, 0x60, 0x44, 0x1C, 0x12, 0x60, 0x45, 0x1E, 0x78, 0x60, 
+0x45, 0xFB, 0xF4, 0x60, 0x46, 0xFE, 0x5A, 0x60, 0x47, 0xF7, 0x85, 0xE0, 0x48, 0xDE, 0x3C, 0x60, 
+0x49, 0xD7, 0x67, 0xE0, 0x4A, 0xBE, 0x1E, 0x60, 0x4B, 0xB7, 0x49, 0xE0, 0x4C, 0x9E, 0x00, 0x60, 
+0x4D, 0x97, 0x2B, 0xE0, 0x4E, 0x7D, 0xE2, 0x60, 0x4F, 0x77, 0x0D, 0xE0, 0x50, 0x66, 0xFE, 0xE0, 
+0x51, 0x60, 0x2A, 0x60, 0x52, 0x46, 0xE0, 0xE0, 0x53, 0x40, 0x0C, 0x60, 0x54, 0x26, 0xC2, 0xE0, 
+0x55, 0x1F, 0xEE, 0x60, 0x56, 0x06, 0xA4, 0xE0, 0x56, 0xFF, 0xD0, 0x60, 0x57, 0xE6, 0x86, 0xE0, 
+0x58, 0xDF, 0xB2, 0x60, 0x59, 0xC6, 0x68, 0xE0, 0x5A, 0xBF, 0x94, 0x60, 0x5B, 0xAF, 0x85, 0x60, 
+0x5C, 0xA8, 0xB0, 0xE0, 0x5D, 0x8F, 0x67, 0x60, 0x5E, 0x88, 0x92, 0xE0, 0x5F, 0x6F, 0x49, 0x60, 
+0x60, 0x68, 0x74, 0xE0, 0x61, 0x4F, 0x2B, 0x60, 0x62, 0x48, 0x56, 0xE0, 0x63, 0x2F, 0x0D, 0x60, 
+0x64, 0x28, 0x38, 0xE0, 0x65, 0x0E, 0xEF, 0x60, 0x66, 0x11, 0x55, 0x60, 0x66, 0xF8, 0x0B, 0xE0, 
+0x67, 0xF1, 0x37, 0x60, 0x68, 0xD7, 0xED, 0xE0, 0x69, 0xD1, 0x19, 0x60, 0x6A, 0xB7, 0xCF, 0xE0, 
+0x6B, 0xB0, 0xFB, 0x60, 0x6C, 0x97, 0xB1, 0xE0, 0x6D, 0x90, 0xDD, 0x60, 0x6E, 0x77, 0x93, 0xE0, 
+0x6F, 0x70, 0xBF, 0x60, 0x70, 0x60, 0xB0, 0x60, 0x71, 0x59, 0xDB, 0xE0, 0x72, 0x40, 0x92, 0x60, 
+0x73, 0x39, 0xBD, 0xE0, 0x74, 0x20, 0x74, 0x60, 0x75, 0x19, 0x9F, 0xE0, 0x76, 0x00, 0x56, 0x60, 
+0x76, 0xF9, 0x81, 0xE0, 0x77, 0xE0, 0x38, 0x60, 0x78, 0xD9, 0x63, 0xE0, 0x79, 0xC0, 0x1A, 0x60, 
+0x7A, 0xB9, 0x45, 0xE0, 0x7B, 0xA9, 0x36, 0xE0, 0x7C, 0xA2, 0x62, 0x60, 0x7D, 0x89, 0x18, 0xE0, 
+0x7E, 0x82, 0x44, 0x60, 0x7F, 0x68, 0xFA, 0xE0, 0x00, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xB6, 0xD0, 0x01, 0x04, 0x00, 0x00, 0xA8, 0xC0, 0x00, 0x09, 0x00, 0x00, 
-0xA8, 0xC0, 0x00, 0x09, 0x7A, 0x7A, 0x7A, 0x00, 0x4E, 0x5A, 0x44, 0x54, 0x00, 0x4E, 0x5A, 0x53, 
-0x54, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x12, 
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x22, 0x41, 0x6D, 0x75, 0x6E, 0x64, 0x73, 0x65, 0x6E, 0x2D, 0x53, 
-0x63, 0x6F, 0x74, 0x74, 0x20, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x2C, 0x20, 0x53, 0x6F, 
-0x75, 0x74, 0x68, 0x20, 0x50, 0x6F, 0x6C, 0x65, 
+0x02, 0x01, 0x02, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x00, 0x00, 0xAF, 0xC8, 0x01, 0x00, 0x00, 0x00, 0xA1, 0xB8, 0x00, 0x05, 0x00, 
+0x00, 0xA8, 0xC0, 0x01, 0x00, 0x00, 0x00, 0xB6, 0xD0, 0x01, 0x0A, 0x00, 0x00, 0xA8, 0xC0, 0x00, 
+0x00, 0x00, 0x00, 0xA8, 0xC0, 0x00, 0x00, 0x4E, 0x5A, 0x53, 0x54, 0x00, 0x4E, 0x5A, 0x4D, 0x54, 
+0x00, 0x4E, 0x5A, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, 
 
 /* Antarctica/Syowa */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -7535,8 +7536,8 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 
 /* Asia/Amman */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4A, 0x4F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x75, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0D, 0xB6, 0xA3, 0xD6, 0xD0, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x11, 0xB6, 0xA3, 0xD6, 0xD0, 
 0x06, 0x72, 0x79, 0xE0, 0x07, 0x0C, 0xAB, 0x50, 0x08, 0x24, 0x37, 0x60, 0x08, 0xED, 0xDE, 0xD0, 
 0x0A, 0x05, 0x6A, 0xE0, 0x0A, 0xCF, 0x12, 0x50, 0x0B, 0xE7, 0xEF, 0xE0, 0x0C, 0xDA, 0x75, 0xD0, 
 0x0D, 0xC9, 0x23, 0x60, 0x0E, 0x92, 0xCA, 0xD0, 0x0F, 0xA9, 0x05, 0x60, 0x10, 0x72, 0xAC, 0xD0, 
@@ -7553,31 +7554,17 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x42, 0x4C, 0x72, 0xE0, 0x43, 0x3C, 0x63, 0xE0, 0x44, 0x2C, 0x54, 0xE0, 0x45, 0x41, 0x2F, 0xE0, 
 0x46, 0x0C, 0x36, 0xE0, 0x47, 0x21, 0x11, 0xE0, 0x47, 0xEC, 0x18, 0xE0, 0x49, 0x0A, 0x2E, 0x60, 
 0x49, 0xCB, 0xFA, 0xE0, 0x4A, 0xEA, 0x10, 0x60, 0x4B, 0xAB, 0xDC, 0xE0, 0x4C, 0xC9, 0xF2, 0x60, 
-0x4D, 0x94, 0xF9, 0x60, 0x4E, 0xA9, 0xD4, 0x60, 0x4F, 0x74, 0xDB, 0x60, 0x52, 0x69, 0x98, 0x60, 
-0x53, 0x34, 0x9F, 0x60, 0x54, 0x52, 0xB4, 0xE0, 0x55, 0x14, 0x81, 0x60, 0x56, 0x32, 0x96, 0xE0, 
-0x56, 0xFD, 0x9D, 0xE0, 0x58, 0x12, 0x78, 0xE0, 0x58, 0xDD, 0x7F, 0xE0, 0x59, 0xF2, 0x5A, 0xE0, 
-0x5A, 0xBD, 0x61, 0xE0, 0x5B, 0xD2, 0x3C, 0xE0, 0x5C, 0x9D, 0x43, 0xE0, 0x5D, 0xB2, 0x1E, 0xE0, 
-0x5E, 0x7D, 0x25, 0xE0, 0x5F, 0x9B, 0x3B, 0x60, 0x60, 0x5D, 0x07, 0xE0, 0x61, 0x7B, 0x1D, 0x60, 
-0x62, 0x46, 0x24, 0x60, 0x63, 0x5A, 0xFF, 0x60, 0x64, 0x26, 0x06, 0x60, 0x65, 0x3A, 0xE1, 0x60, 
-0x66, 0x05, 0xE8, 0x60, 0x67, 0x1A, 0xC3, 0x60, 0x67, 0xE5, 0xCA, 0x60, 0x69, 0x03, 0xDF, 0xE0, 
-0x69, 0xC5, 0xAC, 0x60, 0x6A, 0xE3, 0xC1, 0xE0, 0x6B, 0xA5, 0x8E, 0x60, 0x6C, 0xC3, 0xA3, 0xE0, 
-0x6D, 0x8E, 0xAA, 0xE0, 0x6E, 0xA3, 0x85, 0xE0, 0x6F, 0x6E, 0x8C, 0xE0, 0x70, 0x83, 0x67, 0xE0, 
-0x71, 0x4E, 0x6E, 0xE0, 0x72, 0x63, 0x49, 0xE0, 0x73, 0x2E, 0x50, 0xE0, 0x74, 0x4C, 0x66, 0x60, 
-0x75, 0x0E, 0x32, 0xE0, 0x76, 0x2C, 0x48, 0x60, 0x76, 0xF7, 0x4F, 0x60, 0x78, 0x0C, 0x2A, 0x60, 
-0x78, 0xD7, 0x31, 0x60, 0x79, 0xEC, 0x0C, 0x60, 0x7A, 0xB7, 0x13, 0x60, 0x7B, 0xCB, 0xEE, 0x60, 
-0x7C, 0x96, 0xF5, 0x60, 0x7D, 0xB5, 0x0A, 0xE0, 0x7E, 0x76, 0xD7, 0x60, 0x7F, 0x94, 0xEC, 0xE0, 
+0x4D, 0x94, 0xF9, 0x60, 0x4E, 0xA9, 0xD4, 0x60, 0x4F, 0x74, 0xDB, 0x60, 0x50, 0x89, 0xB6, 0x60, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x01, 
 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 
-0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 
-0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 
-0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 
-0x03, 0x01, 0x03, 0x01, 0x03, 0x00, 0x00, 0x21, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 
+0x03, 0x01, 0x03, 0x01, 0x05, 0x00, 0x00, 0x21, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 
 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x2A, 
-0x30, 0x01, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBA, 0x14, 0xB8, 0x01, 0x49, 
-0x7C, 0xF5, 0x00, 0x00, 0x00, 0x00, 
+0x30, 0x01, 0x04, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 
+0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBA, 0x14, 0xB8, 0x01, 0x49, 0x7C, 0xF5, 0x00, 0x00, 
+0x00, 0x00, 
 
 /* Asia/Anadyr */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x52, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -8060,13 +8047,13 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* Asia/Dili */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x54, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0x92, 0xE6, 0x18, 0xC4, 
+0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x11, 0x92, 0xE6, 0x18, 0xC4, 
 0xCB, 0x99, 0x32, 0xF0, 0xD2, 0x56, 0xEE, 0x70, 0x0B, 0xEA, 0x30, 0x70, 0x39, 0xC3, 0x99, 0x00, 
 0x01, 0x02, 0x03, 0x04, 0x03, 0x00, 0x00, 0x75, 0xBC, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 
 0x04, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x08, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x04, 0x00, 0x00, 0x70, 
-0x80, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x54, 0x4C, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x43, 
-0x49, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x48, 
-0x68, 0x01, 0xD2, 0x48, 0x7D, 0x00, 0x00, 0x00, 0x00, 
+0x80, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x54, 0x4C, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x57, 
+0x49, 0x54, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 
+0x48, 0x68, 0x01, 0xD2, 0x48, 0x7D, 0x00, 0x00, 0x00, 0x00, 
 
 /* Asia/Dubai */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -8122,19 +8109,19 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x45, 0x12, 0xFD, 0x50, 0x46, 0x0E, 0xD9, 0xE0, 0x46, 0xE8, 0x6F, 0x70, 0x47, 0xEC, 0x18, 0xE0, 
 0x48, 0xB7, 0x11, 0xD0, 0x49, 0xCB, 0xFA, 0xE0, 0x4A, 0xA0, 0x3C, 0x60, 0x4B, 0xAD, 0x2E, 0x9C, 
 0x4C, 0x61, 0xBD, 0xD0, 0x4D, 0x94, 0xF9, 0x9C, 0x4E, 0x35, 0xC2, 0x50, 0x4F, 0x74, 0xDB, 0x60, 
-0x50, 0x5B, 0x91, 0xE0, 0x51, 0x54, 0xBD, 0x60, 0x52, 0x44, 0xAE, 0x60, 0x53, 0x34, 0x9F, 0x60, 
-0x54, 0x24, 0x90, 0x60, 0x55, 0x14, 0x81, 0x60, 0x56, 0x04, 0x72, 0x60, 0x56, 0xFD, 0x9D, 0xE0, 
-0x57, 0xE4, 0x54, 0x60, 0x58, 0xDD, 0x7F, 0xE0, 0x59, 0xC4, 0x36, 0x60, 0x5A, 0xBD, 0x61, 0xE0, 
-0x5B, 0xA4, 0x18, 0x60, 0x5C, 0x9D, 0x43, 0xE0, 0x5D, 0x8D, 0x34, 0xE0, 0x5E, 0x7D, 0x25, 0xE0, 
-0x5F, 0x6D, 0x16, 0xE0, 0x60, 0x5D, 0x07, 0xE0, 0x61, 0x4C, 0xF8, 0xE0, 0x62, 0x46, 0x24, 0x60, 
-0x63, 0x2C, 0xDA, 0xE0, 0x64, 0x26, 0x06, 0x60, 0x65, 0x0C, 0xBC, 0xE0, 0x66, 0x05, 0xE8, 0x60, 
-0x66, 0xF5, 0xD9, 0x60, 0x67, 0xE5, 0xCA, 0x60, 0x68, 0xD5, 0xBB, 0x60, 0x69, 0xC5, 0xAC, 0x60, 
-0x6A, 0xB5, 0x9D, 0x60, 0x6B, 0xA5, 0x8E, 0x60, 0x6C, 0x95, 0x7F, 0x60, 0x6D, 0x8E, 0xAA, 0xE0, 
-0x6E, 0x75, 0x61, 0x60, 0x6F, 0x6E, 0x8C, 0xE0, 0x70, 0x55, 0x43, 0x60, 0x71, 0x4E, 0x6E, 0xE0, 
-0x72, 0x3E, 0x5F, 0xE0, 0x73, 0x2E, 0x50, 0xE0, 0x74, 0x1E, 0x41, 0xE0, 0x75, 0x0E, 0x32, 0xE0, 
-0x75, 0xFE, 0x23, 0xE0, 0x76, 0xF7, 0x4F, 0x60, 0x77, 0xDE, 0x05, 0xE0, 0x78, 0xD7, 0x31, 0x60, 
-0x79, 0xBD, 0xE7, 0xE0, 0x7A, 0xB7, 0x13, 0x60, 0x7B, 0x9D, 0xC9, 0xE0, 0x7C, 0x96, 0xF5, 0x60, 
-0x7D, 0x86, 0xE6, 0x60, 0x7E, 0x76, 0xD7, 0x60, 0x7F, 0x66, 0xC8, 0x60, 0x00, 0x01, 0x00, 0x01, 
+0x50, 0x5B, 0x91, 0xE0, 0x51, 0x54, 0xBD, 0x60, 0x52, 0x44, 0xA0, 0x50, 0x53, 0x34, 0x9F, 0x60, 
+0x54, 0x24, 0x82, 0x50, 0x55, 0x14, 0x81, 0x60, 0x56, 0x04, 0x64, 0x50, 0x56, 0xFD, 0x9D, 0xE0, 
+0x57, 0xE4, 0x46, 0x50, 0x58, 0xDD, 0x7F, 0xE0, 0x59, 0xC4, 0x28, 0x50, 0x5A, 0xBD, 0x61, 0xE0, 
+0x5B, 0xA4, 0x0A, 0x50, 0x5C, 0x9D, 0x43, 0xE0, 0x5D, 0x8D, 0x26, 0xD0, 0x5E, 0x7D, 0x25, 0xE0, 
+0x5F, 0x6D, 0x08, 0xD0, 0x60, 0x5D, 0x07, 0xE0, 0x61, 0x4C, 0xEA, 0xD0, 0x62, 0x46, 0x24, 0x60, 
+0x63, 0x2C, 0xCC, 0xD0, 0x64, 0x26, 0x06, 0x60, 0x65, 0x0C, 0xAE, 0xD0, 0x66, 0x05, 0xE8, 0x60, 
+0x66, 0xF5, 0xCB, 0x50, 0x67, 0xE5, 0xCA, 0x60, 0x68, 0xD5, 0xAD, 0x50, 0x69, 0xC5, 0xAC, 0x60, 
+0x6A, 0xB5, 0x8F, 0x50, 0x6B, 0xA5, 0x8E, 0x60, 0x6C, 0x95, 0x71, 0x50, 0x6D, 0x8E, 0xAA, 0xE0, 
+0x6E, 0x75, 0x53, 0x50, 0x6F, 0x6E, 0x8C, 0xE0, 0x70, 0x55, 0x35, 0x50, 0x71, 0x4E, 0x6E, 0xE0, 
+0x72, 0x3E, 0x51, 0xD0, 0x73, 0x2E, 0x50, 0xE0, 0x74, 0x1E, 0x33, 0xD0, 0x75, 0x0E, 0x32, 0xE0, 
+0x75, 0xFE, 0x15, 0xD0, 0x76, 0xF7, 0x4F, 0x60, 0x77, 0xDD, 0xF7, 0xD0, 0x78, 0xD7, 0x31, 0x60, 
+0x79, 0xBD, 0xD9, 0xD0, 0x7A, 0xB7, 0x13, 0x60, 0x7B, 0x9D, 0xBB, 0xD0, 0x7C, 0x96, 0xF5, 0x60, 
+0x7D, 0x86, 0xD8, 0x50, 0x7E, 0x76, 0xD7, 0x60, 0x7F, 0x66, 0xBA, 0x50, 0x00, 0x01, 0x00, 0x01, 
 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
@@ -8196,19 +8183,19 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x48, 0xBB, 0x06, 0x50, 0x49, 0xCB, 0xFA, 0xE0, 0x4A, 0xA0, 0x3C, 0x60, 0x4B, 0xAB, 0xDC, 0xE0, 
 0x4C, 0x61, 0xBD, 0xD0, 0x4D, 0x94, 0xF9, 0x9C, 0x4E, 0x35, 0xC2, 0x50, 0x4E, 0x5C, 0x0B, 0xE0, 
 0x4E, 0x84, 0xDC, 0x50, 0x4F, 0x74, 0xDB, 0x60, 0x50, 0x5B, 0x91, 0xE0, 0x51, 0x54, 0xBD, 0x60, 
-0x52, 0x44, 0xAE, 0x60, 0x53, 0x34, 0x9F, 0x60, 0x54, 0x24, 0x90, 0x60, 0x55, 0x14, 0x81, 0x60, 
-0x56, 0x04, 0x72, 0x60, 0x56, 0xFD, 0x9D, 0xE0, 0x57, 0xE4, 0x54, 0x60, 0x58, 0xDD, 0x7F, 0xE0, 
-0x59, 0xC4, 0x36, 0x60, 0x5A, 0xBD, 0x61, 0xE0, 0x5B, 0xA4, 0x18, 0x60, 0x5C, 0x9D, 0x43, 0xE0, 
-0x5D, 0x8D, 0x34, 0xE0, 0x5E, 0x7D, 0x25, 0xE0, 0x5F, 0x6D, 0x16, 0xE0, 0x60, 0x5D, 0x07, 0xE0, 
-0x61, 0x4C, 0xF8, 0xE0, 0x62, 0x46, 0x24, 0x60, 0x63, 0x2C, 0xDA, 0xE0, 0x64, 0x26, 0x06, 0x60, 
-0x65, 0x0C, 0xBC, 0xE0, 0x66, 0x05, 0xE8, 0x60, 0x66, 0xF5, 0xD9, 0x60, 0x67, 0xE5, 0xCA, 0x60, 
-0x68, 0xD5, 0xBB, 0x60, 0x69, 0xC5, 0xAC, 0x60, 0x6A, 0xB5, 0x9D, 0x60, 0x6B, 0xA5, 0x8E, 0x60, 
-0x6C, 0x95, 0x7F, 0x60, 0x6D, 0x8E, 0xAA, 0xE0, 0x6E, 0x75, 0x61, 0x60, 0x6F, 0x6E, 0x8C, 0xE0, 
-0x70, 0x55, 0x43, 0x60, 0x71, 0x4E, 0x6E, 0xE0, 0x72, 0x3E, 0x5F, 0xE0, 0x73, 0x2E, 0x50, 0xE0, 
-0x74, 0x1E, 0x41, 0xE0, 0x75, 0x0E, 0x32, 0xE0, 0x75, 0xFE, 0x23, 0xE0, 0x76, 0xF7, 0x4F, 0x60, 
-0x77, 0xDE, 0x05, 0xE0, 0x78, 0xD7, 0x31, 0x60, 0x79, 0xBD, 0xE7, 0xE0, 0x7A, 0xB7, 0x13, 0x60, 
-0x7B, 0x9D, 0xC9, 0xE0, 0x7C, 0x96, 0xF5, 0x60, 0x7D, 0x86, 0xE6, 0x60, 0x7E, 0x76, 0xD7, 0x60, 
-0x7F, 0x66, 0xC8, 0x60, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x01, 
+0x52, 0x44, 0xA0, 0x50, 0x53, 0x34, 0x9F, 0x60, 0x54, 0x24, 0x82, 0x50, 0x55, 0x14, 0x81, 0x60, 
+0x56, 0x04, 0x64, 0x50, 0x56, 0xFD, 0x9D, 0xE0, 0x57, 0xE4, 0x46, 0x50, 0x58, 0xDD, 0x7F, 0xE0, 
+0x59, 0xC4, 0x28, 0x50, 0x5A, 0xBD, 0x61, 0xE0, 0x5B, 0xA4, 0x0A, 0x50, 0x5C, 0x9D, 0x43, 0xE0, 
+0x5D, 0x8D, 0x26, 0xD0, 0x5E, 0x7D, 0x25, 0xE0, 0x5F, 0x6D, 0x08, 0xD0, 0x60, 0x5D, 0x07, 0xE0, 
+0x61, 0x4C, 0xEA, 0xD0, 0x62, 0x46, 0x24, 0x60, 0x63, 0x2C, 0xCC, 0xD0, 0x64, 0x26, 0x06, 0x60, 
+0x65, 0x0C, 0xAE, 0xD0, 0x66, 0x05, 0xE8, 0x60, 0x66, 0xF5, 0xCB, 0x50, 0x67, 0xE5, 0xCA, 0x60, 
+0x68, 0xD5, 0xAD, 0x50, 0x69, 0xC5, 0xAC, 0x60, 0x6A, 0xB5, 0x8F, 0x50, 0x6B, 0xA5, 0x8E, 0x60, 
+0x6C, 0x95, 0x71, 0x50, 0x6D, 0x8E, 0xAA, 0xE0, 0x6E, 0x75, 0x53, 0x50, 0x6F, 0x6E, 0x8C, 0xE0, 
+0x70, 0x55, 0x35, 0x50, 0x71, 0x4E, 0x6E, 0xE0, 0x72, 0x3E, 0x51, 0xD0, 0x73, 0x2E, 0x50, 0xE0, 
+0x74, 0x1E, 0x33, 0xD0, 0x75, 0x0E, 0x32, 0xE0, 0x75, 0xFE, 0x15, 0xD0, 0x76, 0xF7, 0x4F, 0x60, 
+0x77, 0xDD, 0xF7, 0xD0, 0x78, 0xD7, 0x31, 0x60, 0x79, 0xBD, 0xD9, 0xD0, 0x7A, 0xB7, 0x13, 0x60, 
+0x7B, 0x9D, 0xBB, 0xD0, 0x7C, 0x96, 0xF5, 0x60, 0x7D, 0x86, 0xD8, 0x50, 0x7E, 0x76, 0xD7, 0x60, 
+0x7F, 0x66, 0xBA, 0x50, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x01, 0x02, 
@@ -8397,7 +8384,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0xDA, 0xFF, 0x26, 0x00, 0xF4, 0xB5, 0xBE, 0x88, 0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x00, 
 0x00, 0x64, 0x20, 0x00, 0x00, 0x00, 0x00, 0x67, 0x20, 0x00, 0x04, 0x00, 0x00, 0x69, 0x78, 0x00, 
 0x09, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0D, 0x00, 0x00, 0x70, 0x80, 0x00, 0x09, 0x00, 0x00, 0x62, 
-0x70, 0x00, 0x09, 0x4A, 0x4D, 0x54, 0x00, 0x4A, 0x41, 0x56, 0x54, 0x00, 0x57, 0x49, 0x54, 0x00, 
+0x70, 0x00, 0x09, 0x42, 0x4D, 0x54, 0x00, 0x4A, 0x41, 0x56, 0x54, 0x00, 0x57, 0x49, 0x42, 0x00, 
 0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x7F, 0xEB, 0x65, 0x01, 0xB5, 0x9F, 0x40, 0x00, 0x00, 0x00, 0x0E, 0x4A, 0x61, 0x76, 0x61, 
 0x20, 0x26, 0x20, 0x53, 0x75, 0x6D, 0x61, 0x74, 0x72, 0x61, 
@@ -8408,7 +8395,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0xBA, 0x16, 0xC1, 0x98, 
 0xD0, 0x58, 0xB9, 0xF0, 0xF4, 0xB5, 0xA2, 0x68, 0x01, 0x02, 0x01, 0x00, 0x00, 0x83, 0xE8, 0x00, 
 0x00, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x04, 0x00, 0x00, 0x85, 0x98, 0x00, 0x08, 0x4C, 0x4D, 0x54, 
-0x00, 0x45, 0x49, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x57, 0x49, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x85, 0x76, 0xAA, 0x01, 0xE9, 0x59, 0x70, 0x00, 0x00, 0x00, 0x31, 0x77, 0x65, 0x73, 0x74, 0x20, 
 0x4E, 0x65, 0x77, 0x20, 0x47, 0x75, 0x69, 0x6E, 0x65, 0x61, 0x20, 0x28, 0x49, 0x72, 0x69, 0x61, 
 0x6E, 0x20, 0x4A, 0x61, 0x79, 0x61, 0x29, 0x20, 0x26, 0x20, 0x4D, 0x61, 0x6C, 0x75, 0x6B, 0x75, 
@@ -8441,19 +8428,19 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x46, 0xEC, 0x63, 0xF0, 0x47, 0xEC, 0x35, 0x00, 0x48, 0xE7, 0xF5, 0x70, 0x49, 0xCC, 0x17, 0x00, 
 0x4A, 0xBE, 0x9C, 0xF0, 0x4B, 0xAB, 0xF9, 0x00, 0x4C, 0x8C, 0x09, 0xF0, 0x4D, 0x95, 0x15, 0x80, 
 0x4E, 0x87, 0x9B, 0x70, 0x4F, 0x74, 0xF7, 0x80, 0x50, 0x5E, 0x42, 0xF0, 0x51, 0x54, 0xD9, 0x80, 
-0x52, 0x50, 0x99, 0xF0, 0x53, 0x34, 0xBB, 0x80, 0x54, 0x30, 0x7B, 0xF0, 0x55, 0x14, 0x9D, 0x80, 
-0x56, 0x10, 0x5D, 0xF0, 0x56, 0xF4, 0x7F, 0x80, 0x57, 0xF0, 0x3F, 0xF0, 0x58, 0xD4, 0x61, 0x80, 
-0x59, 0xD9, 0x5C, 0x70, 0x5A, 0xB4, 0x43, 0x80, 0x5B, 0xB9, 0x3E, 0x70, 0x5C, 0x9D, 0x60, 0x00, 
-0x5D, 0x99, 0x20, 0x70, 0x5E, 0x7D, 0x42, 0x00, 0x5F, 0x79, 0x02, 0x70, 0x60, 0x5D, 0x24, 0x00, 
-0x61, 0x58, 0xE4, 0x70, 0x62, 0x3D, 0x06, 0x00, 0x63, 0x38, 0xC6, 0x70, 0x64, 0x1C, 0xE8, 0x00, 
-0x65, 0x21, 0xE2, 0xF0, 0x66, 0x06, 0x04, 0x80, 0x67, 0x01, 0xC4, 0xF0, 0x67, 0xE5, 0xE6, 0x80, 
-0x68, 0xE1, 0xA6, 0xF0, 0x69, 0xC5, 0xC8, 0x80, 0x6A, 0xC1, 0x88, 0xF0, 0x6B, 0xA5, 0xAA, 0x80, 
-0x6C, 0xA2, 0xBC, 0x70, 0x6D, 0x85, 0x8C, 0x80, 0x6E, 0x8A, 0x87, 0x70, 0x6F, 0x65, 0x6E, 0x80, 
-0x70, 0x6A, 0x69, 0x70, 0x71, 0x4E, 0x8B, 0x00, 0x72, 0x4A, 0x4B, 0x70, 0x73, 0x2E, 0x6D, 0x00, 
-0x74, 0x2A, 0x2D, 0x70, 0x75, 0x0E, 0x4F, 0x00, 0x76, 0x0A, 0x0F, 0x70, 0x76, 0xEE, 0x31, 0x00, 
-0x77, 0xE9, 0xF1, 0x70, 0x78, 0xCE, 0x13, 0x00, 0x79, 0xD3, 0x0D, 0xF0, 0x7A, 0xAD, 0xF5, 0x00, 
-0x7B, 0xB2, 0xEF, 0xF0, 0x7C, 0x97, 0x11, 0x80, 0x7D, 0x92, 0xD1, 0xF0, 0x7E, 0x76, 0xF3, 0x80, 
-0x7F, 0x72, 0xB3, 0xF0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 
+0x52, 0x6C, 0x49, 0x70, 0x53, 0x34, 0xBB, 0x80, 0x54, 0x4C, 0x2B, 0x70, 0x55, 0x14, 0x9D, 0x80, 
+0x56, 0x2C, 0x0D, 0x70, 0x56, 0xF4, 0x7F, 0x80, 0x58, 0x15, 0x29, 0xF0, 0x58, 0xD4, 0x61, 0x80, 
+0x59, 0xF5, 0x0B, 0xF0, 0x5A, 0xB4, 0x43, 0x80, 0x5B, 0xD4, 0xED, 0xF0, 0x5C, 0x9D, 0x60, 0x00, 
+0x5D, 0xB4, 0xCF, 0xF0, 0x5E, 0x7D, 0x42, 0x00, 0x5F, 0x94, 0xB1, 0xF0, 0x60, 0x5D, 0x24, 0x00, 
+0x61, 0x7D, 0xCE, 0x70, 0x62, 0x3D, 0x06, 0x00, 0x63, 0x5D, 0xB0, 0x70, 0x64, 0x1C, 0xE8, 0x00, 
+0x65, 0x3D, 0x92, 0x70, 0x66, 0x06, 0x04, 0x80, 0x67, 0x1D, 0x74, 0x70, 0x67, 0xE5, 0xE6, 0x80, 
+0x68, 0xFD, 0x56, 0x70, 0x69, 0xC5, 0xC8, 0x80, 0x6A, 0xDD, 0x38, 0x70, 0x6B, 0xA5, 0xAA, 0x80, 
+0x6C, 0xC6, 0x54, 0xF0, 0x6D, 0x85, 0x8C, 0x80, 0x6E, 0xA6, 0x36, 0xF0, 0x6F, 0x65, 0x6E, 0x80, 
+0x70, 0x86, 0x18, 0xF0, 0x71, 0x4E, 0x8B, 0x00, 0x72, 0x65, 0xFA, 0xF0, 0x73, 0x2E, 0x6D, 0x00, 
+0x74, 0x45, 0xDC, 0xF0, 0x75, 0x0E, 0x4F, 0x00, 0x76, 0x2E, 0xF9, 0x70, 0x76, 0xEE, 0x31, 0x00, 
+0x78, 0x0E, 0xDB, 0x70, 0x78, 0xCE, 0x13, 0x00, 0x79, 0xEE, 0xBD, 0x70, 0x7A, 0xAD, 0xF5, 0x00, 
+0x7B, 0xCE, 0x9F, 0x70, 0x7C, 0x97, 0x11, 0x80, 0x7D, 0xAE, 0x81, 0x70, 0x7E, 0x76, 0xF3, 0x80, 
+0x7F, 0x8E, 0x63, 0x70, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
@@ -8465,7 +8452,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x01, 0x02, 0x00, 0x00, 0x20, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 
 0x1C, 0x20, 0x00, 0x08, 0x00, 0x00, 0x38, 0x40, 0x01, 0x0C, 0x4A, 0x4D, 0x54, 0x00, 0x49, 0x44, 
 0x54, 0x00, 0x49, 0x53, 0x54, 0x00, 0x49, 0x44, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xB9, 0xCD, 0x1A, 0x01, 0x48, 0x6B, 0x85, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0xB9, 0xD2, 0x87, 0x01, 0x48, 0x67, 0xD4, 0x00, 0x00, 0x00, 0x00, 
 
 /* Asia/Kabul */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -8754,17 +8741,17 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* Asia/Makassar */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x49, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xA1, 0xF2, 0x5D, 0x90, 
+0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x11, 0xA1, 0xF2, 0x5D, 0x90, 
 0xBA, 0x16, 0xD5, 0x90, 0xCB, 0x88, 0x1D, 0x80, 0xD2, 0x56, 0xEE, 0x70, 0x01, 0x02, 0x03, 0x02, 
 0x00, 0x00, 0x6F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0xF0, 0x00, 0x04, 0x00, 0x00, 0x70, 0x80, 
-0x00, 0x08, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x4D, 0x54, 0x00, 
-0x43, 0x49, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x81, 0x85, 0x8D, 0x01, 0xC8, 0xD9, 0x1F, 0x00, 0x00, 0x00, 0x48, 0x65, 0x61, 0x73, 0x74, 
-0x20, 0x26, 0x20, 0x73, 0x6F, 0x75, 0x74, 0x68, 0x20, 0x42, 0x6F, 0x72, 0x6E, 0x65, 0x6F, 0x2C, 
-0x20, 0x53, 0x75, 0x6C, 0x61, 0x77, 0x65, 0x73, 0x69, 0x20, 0x28, 0x43, 0x65, 0x6C, 0x65, 0x62, 
-0x65, 0x73, 0x29, 0x2C, 0x20, 0x42, 0x61, 0x6C, 0x69, 0x2C, 0x20, 0x4E, 0x75, 0x73, 0x61, 0x20, 
-0x54, 0x65, 0x6E, 0x67, 0x61, 0x72, 0x72, 0x61, 0x2C, 0x20, 0x77, 0x65, 0x73, 0x74, 0x20, 0x54, 
-0x69, 0x6D, 0x6F, 0x72, 
+0x00, 0x08, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x4D, 0x54, 0x00, 
+0x57, 0x49, 0x54, 0x41, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x81, 0x85, 0x8D, 0x01, 0xC8, 0xD9, 0x1F, 0x00, 0x00, 0x00, 0x48, 0x65, 0x61, 0x73, 
+0x74, 0x20, 0x26, 0x20, 0x73, 0x6F, 0x75, 0x74, 0x68, 0x20, 0x42, 0x6F, 0x72, 0x6E, 0x65, 0x6F, 
+0x2C, 0x20, 0x53, 0x75, 0x6C, 0x61, 0x77, 0x65, 0x73, 0x69, 0x20, 0x28, 0x43, 0x65, 0x6C, 0x65, 
+0x62, 0x65, 0x73, 0x29, 0x2C, 0x20, 0x42, 0x61, 0x6C, 0x69, 0x2C, 0x20, 0x4E, 0x75, 0x73, 0x61, 
+0x20, 0x54, 0x65, 0x6E, 0x67, 0x61, 0x72, 0x72, 0x61, 0x2C, 0x20, 0x77, 0x65, 0x73, 0x74, 0x20, 
+0x54, 0x69, 0x6D, 0x6F, 0x72, 
 
 /* Asia/Manila */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x50, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -8980,17 +8967,17 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* Asia/Pontianak */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x49, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0x8B, 0xFF, 0x8E, 0x00, 
+0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x15, 0x8B, 0xFF, 0x8E, 0x00, 
 0xBA, 0x16, 0xDF, 0x00, 0xCB, 0x79, 0xA4, 0x08, 0xD2, 0x56, 0xEE, 0x70, 0xD7, 0x3C, 0xC6, 0x08, 
 0xDA, 0xFF, 0x26, 0x00, 0xF4, 0xB5, 0xBE, 0x88, 0x21, 0xDA, 0x74, 0x80, 0x01, 0x02, 0x03, 0x02, 
 0x04, 0x02, 0x05, 0x06, 0x00, 0x00, 0x66, 0x80, 0x00, 0x00, 0x00, 0x00, 0x66, 0x80, 0x00, 0x04, 
 0x00, 0x00, 0x69, 0x78, 0x00, 0x08, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0C, 0x00, 0x00, 0x70, 0x80, 
 0x00, 0x08, 0x00, 0x00, 0x70, 0x80, 0x00, 0x10, 0x00, 0x00, 0x62, 0x70, 0x00, 0x08, 0x4C, 0x4D, 
-0x54, 0x00, 0x50, 0x4D, 0x54, 0x00, 0x57, 0x49, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x43, 0x49, 
-0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x89, 0x47, 0x3A, 0x01, 0xB9, 0x7C, 0xD5, 0x00, 0x00, 0x00, 0x15, 0x77, 0x65, 0x73, 0x74, 
-0x20, 0x26, 0x20, 0x63, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x42, 0x6F, 0x72, 0x6E, 0x65, 
-0x6F, 
+0x54, 0x00, 0x50, 0x4D, 0x54, 0x00, 0x57, 0x49, 0x42, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x57, 0x49, 
+0x54, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x89, 0x47, 0x3A, 0x01, 0xB9, 0x7C, 0xD5, 0x00, 0x00, 0x00, 0x15, 0x77, 0x65, 0x73, 
+0x74, 0x20, 0x26, 0x20, 0x63, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x42, 0x6F, 0x72, 0x6E, 
+0x65, 0x6F, 
 
 /* Asia/Pyongyang */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4B, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -9310,19 +9297,19 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x46, 0xEC, 0x63, 0xF0, 0x47, 0xEC, 0x35, 0x00, 0x48, 0xE7, 0xF5, 0x70, 0x49, 0xCC, 0x17, 0x00, 
 0x4A, 0xBE, 0x9C, 0xF0, 0x4B, 0xAB, 0xF9, 0x00, 0x4C, 0x8C, 0x09, 0xF0, 0x4D, 0x95, 0x15, 0x80, 
 0x4E, 0x87, 0x9B, 0x70, 0x4F, 0x74, 0xF7, 0x80, 0x50, 0x5E, 0x42, 0xF0, 0x51, 0x54, 0xD9, 0x80, 
-0x52, 0x50, 0x99, 0xF0, 0x53, 0x34, 0xBB, 0x80, 0x54, 0x30, 0x7B, 0xF0, 0x55, 0x14, 0x9D, 0x80, 
-0x56, 0x10, 0x5D, 0xF0, 0x56, 0xF4, 0x7F, 0x80, 0x57, 0xF0, 0x3F, 0xF0, 0x58, 0xD4, 0x61, 0x80, 
-0x59, 0xD9, 0x5C, 0x70, 0x5A, 0xB4, 0x43, 0x80, 0x5B, 0xB9, 0x3E, 0x70, 0x5C, 0x9D, 0x60, 0x00, 
-0x5D, 0x99, 0x20, 0x70, 0x5E, 0x7D, 0x42, 0x00, 0x5F, 0x79, 0x02, 0x70, 0x60, 0x5D, 0x24, 0x00, 
-0x61, 0x58, 0xE4, 0x70, 0x62, 0x3D, 0x06, 0x00, 0x63, 0x38, 0xC6, 0x70, 0x64, 0x1C, 0xE8, 0x00, 
-0x65, 0x21, 0xE2, 0xF0, 0x66, 0x06, 0x04, 0x80, 0x67, 0x01, 0xC4, 0xF0, 0x67, 0xE5, 0xE6, 0x80, 
-0x68, 0xE1, 0xA6, 0xF0, 0x69, 0xC5, 0xC8, 0x80, 0x6A, 0xC1, 0x88, 0xF0, 0x6B, 0xA5, 0xAA, 0x80, 
-0x6C, 0xA2, 0xBC, 0x70, 0x6D, 0x85, 0x8C, 0x80, 0x6E, 0x8A, 0x87, 0x70, 0x6F, 0x65, 0x6E, 0x80, 
-0x70, 0x6A, 0x69, 0x70, 0x71, 0x4E, 0x8B, 0x00, 0x72, 0x4A, 0x4B, 0x70, 0x73, 0x2E, 0x6D, 0x00, 
-0x74, 0x2A, 0x2D, 0x70, 0x75, 0x0E, 0x4F, 0x00, 0x76, 0x0A, 0x0F, 0x70, 0x76, 0xEE, 0x31, 0x00, 
-0x77, 0xE9, 0xF1, 0x70, 0x78, 0xCE, 0x13, 0x00, 0x79, 0xD3, 0x0D, 0xF0, 0x7A, 0xAD, 0xF5, 0x00, 
-0x7B, 0xB2, 0xEF, 0xF0, 0x7C, 0x97, 0x11, 0x80, 0x7D, 0x92, 0xD1, 0xF0, 0x7E, 0x76, 0xF3, 0x80, 
-0x7F, 0x72, 0xB3, 0xF0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 
+0x52, 0x6C, 0x49, 0x70, 0x53, 0x34, 0xBB, 0x80, 0x54, 0x4C, 0x2B, 0x70, 0x55, 0x14, 0x9D, 0x80, 
+0x56, 0x2C, 0x0D, 0x70, 0x56, 0xF4, 0x7F, 0x80, 0x58, 0x15, 0x29, 0xF0, 0x58, 0xD4, 0x61, 0x80, 
+0x59, 0xF5, 0x0B, 0xF0, 0x5A, 0xB4, 0x43, 0x80, 0x5B, 0xD4, 0xED, 0xF0, 0x5C, 0x9D, 0x60, 0x00, 
+0x5D, 0xB4, 0xCF, 0xF0, 0x5E, 0x7D, 0x42, 0x00, 0x5F, 0x94, 0xB1, 0xF0, 0x60, 0x5D, 0x24, 0x00, 
+0x61, 0x7D, 0xCE, 0x70, 0x62, 0x3D, 0x06, 0x00, 0x63, 0x5D, 0xB0, 0x70, 0x64, 0x1C, 0xE8, 0x00, 
+0x65, 0x3D, 0x92, 0x70, 0x66, 0x06, 0x04, 0x80, 0x67, 0x1D, 0x74, 0x70, 0x67, 0xE5, 0xE6, 0x80, 
+0x68, 0xFD, 0x56, 0x70, 0x69, 0xC5, 0xC8, 0x80, 0x6A, 0xDD, 0x38, 0x70, 0x6B, 0xA5, 0xAA, 0x80, 
+0x6C, 0xC6, 0x54, 0xF0, 0x6D, 0x85, 0x8C, 0x80, 0x6E, 0xA6, 0x36, 0xF0, 0x6F, 0x65, 0x6E, 0x80, 
+0x70, 0x86, 0x18, 0xF0, 0x71, 0x4E, 0x8B, 0x00, 0x72, 0x65, 0xFA, 0xF0, 0x73, 0x2E, 0x6D, 0x00, 
+0x74, 0x45, 0xDC, 0xF0, 0x75, 0x0E, 0x4F, 0x00, 0x76, 0x2E, 0xF9, 0x70, 0x76, 0xEE, 0x31, 0x00, 
+0x78, 0x0E, 0xDB, 0x70, 0x78, 0xCE, 0x13, 0x00, 0x79, 0xEE, 0xBD, 0x70, 0x7A, 0xAD, 0xF5, 0x00, 
+0x7B, 0xCE, 0x9F, 0x70, 0x7C, 0x97, 0x11, 0x80, 0x7D, 0xAE, 0x81, 0x70, 0x7E, 0x76, 0xF3, 0x80, 
+0x7F, 0x8E, 0x63, 0x70, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
@@ -9368,12 +9355,12 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* Asia/Ujung_Pandang */
 0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xA1, 0xF2, 0x5D, 0x90, 
+0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x11, 0xA1, 0xF2, 0x5D, 0x90, 
 0xBA, 0x16, 0xD5, 0x90, 0xCB, 0x88, 0x1D, 0x80, 0xD2, 0x56, 0xEE, 0x70, 0x01, 0x02, 0x03, 0x02, 
 0x00, 0x00, 0x6F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0xF0, 0x00, 0x04, 0x00, 0x00, 0x70, 0x80, 
-0x00, 0x08, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x4D, 0x54, 0x00, 
-0x43, 0x49, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x08, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x4D, 0x54, 0x00, 
+0x57, 0x49, 0x54, 0x41, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, 
 
 /* Asia/Ulaanbaatar */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -15346,8 +15333,9 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 
 /* Europe/Vaduz */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4C, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x09, 0x15, 0x23, 0xEB, 0x90, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x09, 0xCA, 0x17, 0x6A, 0x00, 
+0xCA, 0xE2, 0x71, 0x00, 0xCB, 0xF7, 0x4C, 0x00, 0xCC, 0xC2, 0x53, 0x00, 0x15, 0x23, 0xEB, 0x90, 
 0x16, 0x13, 0xDC, 0x90, 0x17, 0x03, 0xCD, 0x90, 0x17, 0xF3, 0xBE, 0x90, 0x18, 0xE3, 0xAF, 0x90, 
 0x19, 0xD3, 0xA0, 0x90, 0x1A, 0xC3, 0x91, 0x90, 0x1B, 0xBC, 0xBD, 0x10, 0x1C, 0xAC, 0xAE, 0x10, 
 0x1D, 0x9C, 0x9F, 0x10, 0x1E, 0x8C, 0x90, 0x10, 0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10, 
@@ -15376,17 +15364,17 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10, 
 0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10, 
 0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 
-0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
-0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
-0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
-0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
-0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
-0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
-0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
-0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x20, 
-0x01, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 
-0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0xD1, 0x46, 0x38, 0x01, 0x21, 0x2D, 0xF2, 0x00, 
-0x00, 0x00, 0x00, 
+0x7F, 0x8E, 0x7F, 0x90, 0x00, 0x01, 0x00, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 
+0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 
+0x00, 0x05, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 
+0x00, 0x01, 0x01, 0x00, 0xD1, 0x46, 0x38, 0x01, 0x21, 0x2D, 0xF2, 0x00, 0x00, 0x00, 0x00, 
 
 /* Europe/Vatican */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x56, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -16249,19 +16237,19 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x46, 0xEC, 0x63, 0xF0, 0x47, 0xEC, 0x35, 0x00, 0x48, 0xE7, 0xF5, 0x70, 0x49, 0xCC, 0x17, 0x00, 
 0x4A, 0xBE, 0x9C, 0xF0, 0x4B, 0xAB, 0xF9, 0x00, 0x4C, 0x8C, 0x09, 0xF0, 0x4D, 0x95, 0x15, 0x80, 
 0x4E, 0x87, 0x9B, 0x70, 0x4F, 0x74, 0xF7, 0x80, 0x50, 0x5E, 0x42, 0xF0, 0x51, 0x54, 0xD9, 0x80, 
-0x52, 0x50, 0x99, 0xF0, 0x53, 0x34, 0xBB, 0x80, 0x54, 0x30, 0x7B, 0xF0, 0x55, 0x14, 0x9D, 0x80, 
-0x56, 0x10, 0x5D, 0xF0, 0x56, 0xF4, 0x7F, 0x80, 0x57, 0xF0, 0x3F, 0xF0, 0x58, 0xD4, 0x61, 0x80, 
-0x59, 0xD9, 0x5C, 0x70, 0x5A, 0xB4, 0x43, 0x80, 0x5B, 0xB9, 0x3E, 0x70, 0x5C, 0x9D, 0x60, 0x00, 
-0x5D, 0x99, 0x20, 0x70, 0x5E, 0x7D, 0x42, 0x00, 0x5F, 0x79, 0x02, 0x70, 0x60, 0x5D, 0x24, 0x00, 
-0x61, 0x58, 0xE4, 0x70, 0x62, 0x3D, 0x06, 0x00, 0x63, 0x38, 0xC6, 0x70, 0x64, 0x1C, 0xE8, 0x00, 
-0x65, 0x21, 0xE2, 0xF0, 0x66, 0x06, 0x04, 0x80, 0x67, 0x01, 0xC4, 0xF0, 0x67, 0xE5, 0xE6, 0x80, 
-0x68, 0xE1, 0xA6, 0xF0, 0x69, 0xC5, 0xC8, 0x80, 0x6A, 0xC1, 0x88, 0xF0, 0x6B, 0xA5, 0xAA, 0x80, 
-0x6C, 0xA2, 0xBC, 0x70, 0x6D, 0x85, 0x8C, 0x80, 0x6E, 0x8A, 0x87, 0x70, 0x6F, 0x65, 0x6E, 0x80, 
-0x70, 0x6A, 0x69, 0x70, 0x71, 0x4E, 0x8B, 0x00, 0x72, 0x4A, 0x4B, 0x70, 0x73, 0x2E, 0x6D, 0x00, 
-0x74, 0x2A, 0x2D, 0x70, 0x75, 0x0E, 0x4F, 0x00, 0x76, 0x0A, 0x0F, 0x70, 0x76, 0xEE, 0x31, 0x00, 
-0x77, 0xE9, 0xF1, 0x70, 0x78, 0xCE, 0x13, 0x00, 0x79, 0xD3, 0x0D, 0xF0, 0x7A, 0xAD, 0xF5, 0x00, 
-0x7B, 0xB2, 0xEF, 0xF0, 0x7C, 0x97, 0x11, 0x80, 0x7D, 0x92, 0xD1, 0xF0, 0x7E, 0x76, 0xF3, 0x80, 
-0x7F, 0x72, 0xB3, 0xF0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 
+0x52, 0x6C, 0x49, 0x70, 0x53, 0x34, 0xBB, 0x80, 0x54, 0x4C, 0x2B, 0x70, 0x55, 0x14, 0x9D, 0x80, 
+0x56, 0x2C, 0x0D, 0x70, 0x56, 0xF4, 0x7F, 0x80, 0x58, 0x15, 0x29, 0xF0, 0x58, 0xD4, 0x61, 0x80, 
+0x59, 0xF5, 0x0B, 0xF0, 0x5A, 0xB4, 0x43, 0x80, 0x5B, 0xD4, 0xED, 0xF0, 0x5C, 0x9D, 0x60, 0x00, 
+0x5D, 0xB4, 0xCF, 0xF0, 0x5E, 0x7D, 0x42, 0x00, 0x5F, 0x94, 0xB1, 0xF0, 0x60, 0x5D, 0x24, 0x00, 
+0x61, 0x7D, 0xCE, 0x70, 0x62, 0x3D, 0x06, 0x00, 0x63, 0x5D, 0xB0, 0x70, 0x64, 0x1C, 0xE8, 0x00, 
+0x65, 0x3D, 0x92, 0x70, 0x66, 0x06, 0x04, 0x80, 0x67, 0x1D, 0x74, 0x70, 0x67, 0xE5, 0xE6, 0x80, 
+0x68, 0xFD, 0x56, 0x70, 0x69, 0xC5, 0xC8, 0x80, 0x6A, 0xDD, 0x38, 0x70, 0x6B, 0xA5, 0xAA, 0x80, 
+0x6C, 0xC6, 0x54, 0xF0, 0x6D, 0x85, 0x8C, 0x80, 0x6E, 0xA6, 0x36, 0xF0, 0x6F, 0x65, 0x6E, 0x80, 
+0x70, 0x86, 0x18, 0xF0, 0x71, 0x4E, 0x8B, 0x00, 0x72, 0x65, 0xFA, 0xF0, 0x73, 0x2E, 0x6D, 0x00, 
+0x74, 0x45, 0xDC, 0xF0, 0x75, 0x0E, 0x4F, 0x00, 0x76, 0x2E, 0xF9, 0x70, 0x76, 0xEE, 0x31, 0x00, 
+0x78, 0x0E, 0xDB, 0x70, 0x78, 0xCE, 0x13, 0x00, 0x79, 0xEE, 0xBD, 0x70, 0x7A, 0xAD, 0xF5, 0x00, 
+0x7B, 0xCE, 0x9F, 0x70, 0x7C, 0x97, 0x11, 0x80, 0x7D, 0xAE, 0x81, 0x70, 0x7E, 0x76, 0xF3, 0x80, 
+0x7F, 0x8E, 0x63, 0x70, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
@@ -16278,14 +16266,14 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* Jamaica */
 0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x93, 0x0F, 0xB5, 0x00, 
+0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x93, 0x0F, 0xB4, 0xFF, 
 0x08, 0x20, 0xC1, 0x70, 0x09, 0x10, 0xA4, 0x60, 0x09, 0xAD, 0x94, 0xF0, 0x0A, 0xF0, 0x86, 0x60, 
 0x0B, 0xE0, 0x85, 0x70, 0x0C, 0xD9, 0xA2, 0xE0, 0x0D, 0xC0, 0x67, 0x70, 0x0E, 0xB9, 0x84, 0xE0, 
 0x0F, 0xA9, 0x83, 0xF0, 0x10, 0x99, 0x66, 0xE0, 0x11, 0x89, 0x65, 0xF0, 0x12, 0x79, 0x48, 0xE0, 
 0x13, 0x69, 0x47, 0xF0, 0x14, 0x59, 0x2A, 0xE0, 0x15, 0x49, 0x29, 0xF0, 0x16, 0x39, 0x0C, 0xE0, 
 0x17, 0x29, 0x0B, 0xF0, 0x18, 0x22, 0x29, 0x60, 0x19, 0x08, 0xED, 0xF0, 0x1A, 0x02, 0x0B, 0x60, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
-0x01, 0x02, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0xB8, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 
+0x01, 0x02, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0xB8, 0x01, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 
 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0x4B, 0x4D, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45, 
 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 
 0x80, 0x00, 0x00, 0x00, 0x00, 
@@ -16999,19 +16987,19 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x36, 0x3B, 0x17, 0xE0, 0x36, 0xD7, 0xFA, 0x60, 0x38, 0x24, 0x34, 0x60, 0x38, 0xB7, 0xDC, 0x60, 
 0x4B, 0x11, 0x2C, 0xE0, 0x4B, 0xAE, 0x0F, 0x60, 0x4C, 0xC2, 0xEA, 0x60, 0x4D, 0x72, 0x41, 0xE0, 
 0x4E, 0xA2, 0xCC, 0x60, 0x4F, 0x1A, 0xC4, 0xE0, 0x50, 0x82, 0xAE, 0x60, 0x50, 0xFA, 0xA6, 0xE0, 
-0x52, 0x62, 0x90, 0x60, 0x52, 0xDA, 0x88, 0xE0, 0x54, 0x42, 0x72, 0x60, 0x54, 0xBA, 0x6A, 0xE0, 
-0x56, 0x22, 0x54, 0x60, 0x56, 0xA3, 0x87, 0x60, 0x58, 0x0B, 0x70, 0xE0, 0x58, 0x83, 0x69, 0x60, 
+0x52, 0x6B, 0xCA, 0xE0, 0x52, 0xDA, 0x88, 0xE0, 0x54, 0x4B, 0xAC, 0xE0, 0x54, 0xBA, 0x6A, 0xE0, 
+0x56, 0x2B, 0x8E, 0xE0, 0x56, 0xA3, 0x87, 0x60, 0x58, 0x0B, 0x70, 0xE0, 0x58, 0x83, 0x69, 0x60, 
 0x59, 0xEB, 0x52, 0xE0, 0x5A, 0x63, 0x4B, 0x60, 0x5B, 0xCB, 0x34, 0xE0, 0x5C, 0x43, 0x2D, 0x60, 
-0x5D, 0xAB, 0x16, 0xE0, 0x5E, 0x23, 0x0F, 0x60, 0x5F, 0x8A, 0xF8, 0xE0, 0x60, 0x0C, 0x2B, 0xE0, 
+0x5D, 0xB4, 0x51, 0x60, 0x5E, 0x23, 0x0F, 0x60, 0x5F, 0x94, 0x33, 0x60, 0x60, 0x0C, 0x2B, 0xE0, 
 0x61, 0x74, 0x15, 0x60, 0x61, 0xEC, 0x0D, 0xE0, 0x63, 0x53, 0xF7, 0x60, 0x63, 0xCB, 0xEF, 0xE0, 
-0x65, 0x33, 0xD9, 0x60, 0x65, 0xAB, 0xD1, 0xE0, 0x67, 0x13, 0xBB, 0x60, 0x67, 0x8B, 0xB3, 0xE0, 
-0x68, 0xF3, 0x9D, 0x60, 0x69, 0x6B, 0x95, 0xE0, 0x6A, 0xD3, 0x7F, 0x60, 0x6B, 0x54, 0xB2, 0x60, 
+0x65, 0x33, 0xD9, 0x60, 0x65, 0xAB, 0xD1, 0xE0, 0x67, 0x1C, 0xF5, 0xE0, 0x67, 0x8B, 0xB3, 0xE0, 
+0x68, 0xFC, 0xD7, 0xE0, 0x69, 0x6B, 0x95, 0xE0, 0x6A, 0xDC, 0xB9, 0xE0, 0x6B, 0x54, 0xB2, 0x60, 
 0x6C, 0xBC, 0x9B, 0xE0, 0x6D, 0x34, 0x94, 0x60, 0x6E, 0x9C, 0x7D, 0xE0, 0x6F, 0x14, 0x76, 0x60, 
-0x70, 0x7C, 0x5F, 0xE0, 0x70, 0xF4, 0x58, 0x60, 0x72, 0x5C, 0x41, 0xE0, 0x72, 0xD4, 0x3A, 0x60, 
-0x74, 0x3C, 0x23, 0xE0, 0x74, 0xB4, 0x1C, 0x60, 0x76, 0x25, 0x40, 0x60, 0x76, 0x9D, 0x38, 0xE0, 
+0x70, 0x7C, 0x5F, 0xE0, 0x70, 0xF4, 0x58, 0x60, 0x72, 0x65, 0x7C, 0x60, 0x72, 0xD4, 0x3A, 0x60, 
+0x74, 0x45, 0x5E, 0x60, 0x74, 0xB4, 0x1C, 0x60, 0x76, 0x25, 0x40, 0x60, 0x76, 0x9D, 0x38, 0xE0, 
 0x78, 0x05, 0x22, 0x60, 0x78, 0x7D, 0x1A, 0xE0, 0x79, 0xE5, 0x04, 0x60, 0x7A, 0x5C, 0xFC, 0xE0, 
-0x7B, 0xC4, 0xE6, 0x60, 0x7C, 0x3C, 0xDE, 0xE0, 0x7D, 0xA4, 0xC8, 0x60, 0x7E, 0x1C, 0xC0, 0xE0, 
-0x7F, 0x84, 0xAA, 0x60, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
+0x7B, 0xC4, 0xE6, 0x60, 0x7C, 0x3C, 0xDE, 0xE0, 0x7D, 0xAE, 0x02, 0xE0, 0x7E, 0x1C, 0xC0, 0xE0, 
+0x7F, 0x8D, 0xE4, 0xE0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
@@ -17074,11 +17062,13 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 
 /* Pacific/Johnston */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x55, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0xFF, 0xFF, 0x73, 0x60, 
-0x00, 0x00, 0x48, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0xA2, 0xE3, 0x38, 0x00, 0x0F, 0xFF, 0x0D, 
-0x00, 0x00, 0x00, 0x0E, 0x4A, 0x6F, 0x68, 0x6E, 0x73, 0x74, 0x6F, 0x6E, 0x20, 0x41, 0x74, 0x6F, 
-0x6C, 0x6C, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0xBB, 0x05, 0x43, 0x48, 
+0xBB, 0x21, 0x71, 0x58, 0xCB, 0x89, 0x3D, 0xC8, 0xD2, 0x61, 0x49, 0x38, 0xD5, 0x8D, 0x73, 0x48, 
+0x01, 0x00, 0x01, 0x00, 0x02, 0xFF, 0xFF, 0x6C, 0x58, 0x00, 0x00, 0xFF, 0xFF, 0x7A, 0x68, 0x01, 
+0x04, 0xFF, 0xFF, 0x73, 0x60, 0x00, 0x00, 0x48, 0x53, 0x54, 0x00, 0x48, 0x44, 0x54, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0xE3, 0x38, 0x00, 0x0F, 0xFF, 0x0D, 0x00, 0x00, 0x00, 
+0x0E, 0x4A, 0x6F, 0x68, 0x6E, 0x73, 0x74, 0x6F, 0x6E, 0x20, 0x41, 0x74, 0x6F, 0x6C, 0x6C, 
 
 /* Pacific/Kiritimati */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4B, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -18410,4 +18400,4 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x00, 0x00, 0x55, 0x54, 0x43, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 
 0x00, 0x00, 0x00, 0x00, };
 
-const timelib_tzdb timezonedb_builtin = { "2013.3", 579, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
+const timelib_tzdb timezonedb_builtin = { "2013.6", 579, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 04f28aac6..70960b161 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -39,6 +39,20 @@ static __inline __int64_t php_date_llabs( __int64_t i ) { return i >= 0 ? i : -i
 static inline long long php_date_llabs( long long i ) { return i >= 0 ? i : -i; }
 #endif
 
+#ifdef PHP_WIN32
+#define DATE_I64_BUF_LEN 65
+# define DATE_I64A(i, s, len) _i64toa_s(i, s, len, 10)
+# define DATE_A64I(i, s) i = _atoi64(s)
+#else
+#define DATE_I64_BUF_LEN 65
+# define DATE_I64A(i, s, len) \
+	do { \
+		int st = snprintf(s, len, "%lld", i); \
+		s[st] = '\0'; \
+	} while (0);
+# define DATE_A64I(i, s) i = atoll(s)
+#endif
+
 /* {{{ arginfo */
 ZEND_BEGIN_ARG_INFO_EX(arginfo_date, 0, 0, 1)
 	ZEND_ARG_INFO(0, format)
@@ -472,6 +486,8 @@ const zend_function_entry date_funcs_interval[] = {
 
 const zend_function_entry date_funcs_period[] = {
 	PHP_ME(DatePeriod,                __construct,                 arginfo_date_period_construct, ZEND_ACC_CTOR|ZEND_ACC_PUBLIC)
+	PHP_ME(DatePeriod,                __wakeup,                    NULL, ZEND_ACC_PUBLIC)
+	PHP_ME(DatePeriod,                __set_state,                 NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_FE_END
 };
 
@@ -569,9 +585,13 @@ static HashTable *date_object_get_gc(zval *object, zval ***table, int *n TSRMLS_
 static HashTable *date_object_get_properties(zval *object TSRMLS_DC);
 static HashTable *date_object_get_gc_interval(zval *object, zval ***table, int *n TSRMLS_DC);
 static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC);
+static HashTable *date_object_get_gc_period(zval *object, zval ***table, int *n TSRMLS_DC);
+static HashTable *date_object_get_properties_period(zval *object TSRMLS_DC);
 
 zval *date_interval_read_property(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC);
 void date_interval_write_property(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC);
+static zval *date_period_read_property(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC);
+static void date_period_write_property(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC);
 
 /* {{{ Module struct */
 zend_module_entry date_module_entry = {
@@ -977,7 +997,7 @@ char *php_date_short_day_name(timelib_sll y, timelib_sll m, timelib_sll d)
 static char *date_format(char *format, int format_len, timelib_time *t, int localtime)
 {
 	smart_str            string = {0};
-	int                  i, length;
+	int                  i, length = 0;
 	char                 buffer[97];
 	timelib_time_offset *offset = NULL;
 	timelib_sll          isoweek, isoyear;
@@ -1332,7 +1352,7 @@ PHPAPI void php_date_set_tzdb(timelib_tzdb *tzdb)
 }
 /* }}} */
 
-/* {{{ php_parse_date: Backwards compability function */
+/* {{{ php_parse_date: Backwards compatibility function */
 PHPAPI signed long php_parse_date(char *string, signed long *now)
 {
 	timelib_time *parsed_time;
@@ -1982,6 +2002,11 @@ static void date_register_classes(TSRMLS_D)
 	zend_class_implements(date_ce_period TSRMLS_CC, 1, zend_ce_traversable);
 	memcpy(&date_object_handlers_period, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	date_object_handlers_period.clone_obj = date_object_clone_period;
+	date_object_handlers_period.get_properties = date_object_get_properties_period;
+	date_object_handlers_period.get_property_ptr_ptr = NULL;
+	date_object_handlers_period.get_gc = date_object_get_gc_period;
+	date_object_handlers_period.read_property = date_period_read_property;
+	date_object_handlers_period.write_property = date_period_write_property;
 
 #define REGISTER_PERIOD_CLASS_CONST_STRING(const_name, value) \
 	zend_declare_class_constant_long(date_ce_period, const_name, sizeof(const_name)-1, value TSRMLS_CC);
@@ -2081,20 +2106,20 @@ static HashTable *date_object_get_properties(zval *object TSRMLS_DC)
 
 	props = zend_std_get_properties(object TSRMLS_CC);
 
-	if (!dateobj->time) {
+	if (!dateobj->time || GC_G(gc_active)) {
 		return props;
 	}
 
 	/* first we add the date and time in ISO format */
 	MAKE_STD_ZVAL(zv);
 	ZVAL_STRING(zv, date_format("Y-m-d H:i:s", 12, dateobj->time, 1), 0);
-	zend_hash_update(props, "date", 5, &zv, sizeof(zval), NULL);
+	zend_hash_update(props, "date", 5, &zv, sizeof(zv), NULL);
 
 	/* then we add the timezone name (or similar) */
 	if (dateobj->time->is_localtime) {
 		MAKE_STD_ZVAL(zv);
 		ZVAL_LONG(zv, dateobj->time->zone_type);
-		zend_hash_update(props, "timezone_type", 14, &zv, sizeof(zval), NULL);
+		zend_hash_update(props, "timezone_type", 14, &zv, sizeof(zv), NULL);
 
 		MAKE_STD_ZVAL(zv);
 		switch (dateobj->time->zone_type) {
@@ -2117,7 +2142,7 @@ static HashTable *date_object_get_properties(zval *object TSRMLS_DC)
 				ZVAL_STRING(zv, dateobj->time->tz_abbr, 1);
 				break;
 		}
-		zend_hash_update(props, "timezone", 9, &zv, sizeof(zval), NULL);
+		zend_hash_update(props, "timezone", 9, &zv, sizeof(zv), NULL);
 	}
 
 	return props;
@@ -2229,7 +2254,6 @@ static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC)
 	zval *zv;
 	php_interval_obj     *intervalobj;
 
-
 	intervalobj = (php_interval_obj *) zend_object_store_get_object(object TSRMLS_CC);
 
 	props = zend_std_get_properties(object TSRMLS_CC);
@@ -2240,8 +2264,8 @@ static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC)
 
 #define PHP_DATE_INTERVAL_ADD_PROPERTY(n,f) \
 	MAKE_STD_ZVAL(zv); \
-	ZVAL_LONG(zv, intervalobj->diff->f); \
-	zend_hash_update(props, n, strlen(n) + 1, &zv, sizeof(zval), NULL);
+	ZVAL_LONG(zv, (long)intervalobj->diff->f); \
+	zend_hash_update(props, n, strlen(n) + 1, &zv, sizeof(zv), NULL);
 
 	PHP_DATE_INTERVAL_ADD_PROPERTY("y", y);
 	PHP_DATE_INTERVAL_ADD_PROPERTY("m", m);
@@ -2249,14 +2273,21 @@ static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC)
 	PHP_DATE_INTERVAL_ADD_PROPERTY("h", h);
 	PHP_DATE_INTERVAL_ADD_PROPERTY("i", i);
 	PHP_DATE_INTERVAL_ADD_PROPERTY("s", s);
+	PHP_DATE_INTERVAL_ADD_PROPERTY("weekday", weekday);
+	PHP_DATE_INTERVAL_ADD_PROPERTY("weekday_behavior", weekday_behavior);
+	PHP_DATE_INTERVAL_ADD_PROPERTY("first_last_day_of", first_last_day_of);
 	PHP_DATE_INTERVAL_ADD_PROPERTY("invert", invert);
 	if (intervalobj->diff->days != -99999) {
 		PHP_DATE_INTERVAL_ADD_PROPERTY("days", days);
 	} else {
 		MAKE_STD_ZVAL(zv);
 		ZVAL_FALSE(zv);
-		zend_hash_update(props, "days", 5, &zv, sizeof(zval), NULL);
+		zend_hash_update(props, "days", 5, &zv, sizeof(zv), NULL);
 	}
+	PHP_DATE_INTERVAL_ADD_PROPERTY("special_type", special.type);
+	PHP_DATE_INTERVAL_ADD_PROPERTY("special_amount", special.amount);
+	PHP_DATE_INTERVAL_ADD_PROPERTY("have_weekday_relative", have_weekday_relative);
+	PHP_DATE_INTERVAL_ADD_PROPERTY("have_special_relative", have_special_relative);
 
 	return props;
 }
@@ -2358,6 +2389,7 @@ PHPAPI zval *php_date_instantiate(zend_class_entry *pce, zval *object TSRMLS_DC)
 	object_init_ex(object, pce);
 	Z_SET_REFCOUNT_P(object, 1);
 	Z_UNSET_ISREF_P(object);
+
 	return object;
 }
 
@@ -2377,8 +2409,8 @@ PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char *time_str,
 	timelib_time   *now;
 	timelib_tzinfo *tzi = NULL;
 	timelib_error_container *err = NULL;
-	int type = TIMELIB_ZONETYPE_ID, new_dst;
-	char *new_abbr;
+	int type = TIMELIB_ZONETYPE_ID, new_dst = 0;
+	char *new_abbr = NULL;
 	timelib_sll     new_offset;
 	
 	if (dateobj->time) {
@@ -3536,7 +3568,11 @@ zval *date_interval_read_property(zval *object, zval *member, int type, const ze
 	ALLOC_INIT_ZVAL(retval);
 	Z_SET_REFCOUNT_P(retval, 0);
 
-	ZVAL_LONG(retval, value);
+	if (value != -99999) {
+		ZVAL_LONG(retval, value);
+	} else {
+		ZVAL_FALSE(retval);
+	}
 
 	if (member == &tmp_member) {
 		zval_dtor(member);
@@ -3629,30 +3665,48 @@ PHP_METHOD(DateInterval, __construct)
 }
 /* }}} */
 
-static long php_date_long_from_hash_element(HashTable *myht, char *element, size_t size)
-{
-	zval            **z_arg = NULL;
-
-	if (zend_hash_find(myht, element, size + 1, (void**) &z_arg) == SUCCESS) {
-		convert_to_long(*z_arg);
-		return Z_LVAL_PP(z_arg);
-	} else {
-		return -1;
-	}
-}
 
 static int php_date_interval_initialize_from_hash(zval **return_value, php_interval_obj **intobj, HashTable *myht TSRMLS_DC)
 {
 	(*intobj)->diff = timelib_rel_time_ctor();
 
-	(*intobj)->diff->y = php_date_long_from_hash_element(myht, "y", 1);
-	(*intobj)->diff->m = php_date_long_from_hash_element(myht, "m", 1);
-	(*intobj)->diff->d = php_date_long_from_hash_element(myht, "d", 1);
-	(*intobj)->diff->h = php_date_long_from_hash_element(myht, "h", 1);
-	(*intobj)->diff->i = php_date_long_from_hash_element(myht, "i", 1);
-	(*intobj)->diff->s = php_date_long_from_hash_element(myht, "s", 1);
-	(*intobj)->diff->invert = php_date_long_from_hash_element(myht, "invert", 6);
-	(*intobj)->diff->days = php_date_long_from_hash_element(myht, "days", 4);
+#define PHP_DATE_INTERVAL_READ_PROPERTY(element, member, itype, def) \
+	do { \
+		zval **z_arg = NULL; \
+		if (zend_hash_find(myht, element, strlen(element) + 1, (void**) &z_arg) == SUCCESS) { \
+			convert_to_long(*z_arg); \
+			(*intobj)->diff->member = (itype)Z_LVAL_PP(z_arg); \
+		} else { \
+			(*intobj)->diff->member = (itype)def; \
+		} \
+	} while (0);
+
+#define PHP_DATE_INTERVAL_READ_PROPERTY_I64(element, member) \
+	do { \
+		zval **z_arg = NULL; \
+		if (zend_hash_find(myht, element, strlen(element) + 1, (void**) &z_arg) == SUCCESS) { \
+			convert_to_string(*z_arg); \
+			DATE_A64I((*intobj)->diff->member, Z_STRVAL_PP(z_arg)); \
+		} else { \
+			(*intobj)->diff->member = -1LL; \
+		} \
+	} while (0);
+
+	PHP_DATE_INTERVAL_READ_PROPERTY("y", y, timelib_sll, -1)
+	PHP_DATE_INTERVAL_READ_PROPERTY("m", m, timelib_sll, -1)
+	PHP_DATE_INTERVAL_READ_PROPERTY("d", d, timelib_sll, -1)
+	PHP_DATE_INTERVAL_READ_PROPERTY("h", h, timelib_sll, -1)
+	PHP_DATE_INTERVAL_READ_PROPERTY("i", i, timelib_sll, -1)
+	PHP_DATE_INTERVAL_READ_PROPERTY("s", s, timelib_sll, -1)
+	PHP_DATE_INTERVAL_READ_PROPERTY("weekday", weekday, int, -1)
+	PHP_DATE_INTERVAL_READ_PROPERTY("weekday_behavior", weekday_behavior, int, -1)
+	PHP_DATE_INTERVAL_READ_PROPERTY("first_last_day_of", first_last_day_of, int, -1)
+	PHP_DATE_INTERVAL_READ_PROPERTY("invert", invert, int, 0);
+	PHP_DATE_INTERVAL_READ_PROPERTY_I64("days", days);
+	PHP_DATE_INTERVAL_READ_PROPERTY("special_type", special.type, unsigned int, 0);
+	PHP_DATE_INTERVAL_READ_PROPERTY_I64("special_amount", special.amount);
+	PHP_DATE_INTERVAL_READ_PROPERTY("have_weekday_relative", have_weekday_relative, unsigned int, 0);
+	PHP_DATE_INTERVAL_READ_PROPERTY("have_special_relative", have_special_relative, unsigned int, 0);
 	(*intobj)->initialized = 1;
 
 	return 0;
@@ -4256,6 +4310,229 @@ PHP_FUNCTION(date_sun_info)
 	timelib_time_dtor(t2);
 }
 /* }}} */
+
+static HashTable *date_object_get_gc_period(zval *object, zval ***table, int *n TSRMLS_DC)
+{
+	*table = NULL;
+	*n = 0;
+	return zend_std_get_properties(object TSRMLS_CC);
+}
+
+static HashTable *date_object_get_properties_period(zval *object TSRMLS_DC)
+{
+	HashTable		*props;
+	zval			*zv;
+	php_period_obj	*period_obj;
+
+	period_obj = zend_object_store_get_object(object TSRMLS_CC);
+
+	props = zend_std_get_properties(object TSRMLS_CC);
+
+	if (!period_obj->start || GC_G(gc_active)) {
+		return props;
+	}
+
+	MAKE_STD_ZVAL(zv);
+	if (period_obj->start) {
+		php_date_obj *date_obj;
+		object_init_ex(zv, date_ce_date);
+		date_obj = zend_object_store_get_object(zv TSRMLS_CC);
+		date_obj->time = timelib_time_clone(period_obj->start);
+	} else {
+		ZVAL_NULL(zv);
+	}
+	zend_hash_update(props, "start", sizeof("start"), &zv, sizeof(zv), NULL);
+
+	MAKE_STD_ZVAL(zv);
+	if (period_obj->current) {
+		php_date_obj *date_obj;
+		object_init_ex(zv, date_ce_date);
+		date_obj = zend_object_store_get_object(zv TSRMLS_CC);
+		date_obj->time = timelib_time_clone(period_obj->current);
+	} else {
+		ZVAL_NULL(zv);
+	}
+	zend_hash_update(props, "current", sizeof("current"), &zv, sizeof(zv), NULL);
+
+	MAKE_STD_ZVAL(zv);
+	if (period_obj->end) {
+		php_date_obj *date_obj;
+		object_init_ex(zv, date_ce_date);
+		date_obj = zend_object_store_get_object(zv TSRMLS_CC);
+		date_obj->time = timelib_time_clone(period_obj->end);
+	} else {
+		ZVAL_NULL(zv);
+	}
+	zend_hash_update(props, "end", sizeof("end"), &zv, sizeof(zv), NULL);
+
+	MAKE_STD_ZVAL(zv);
+	if (period_obj->interval) {
+		php_interval_obj *interval_obj;
+		object_init_ex(zv, date_ce_interval);
+		interval_obj = zend_object_store_get_object(zv TSRMLS_CC);
+		interval_obj->diff = timelib_rel_time_clone(period_obj->interval);
+		interval_obj->initialized = 1;
+	} else {
+		ZVAL_NULL(zv);
+	}
+	zend_hash_update(props, "interval", sizeof("interval"), &zv, sizeof(zv), NULL);
+	
+	/* converted to larger type (int->long); must check when unserializing */
+	MAKE_STD_ZVAL(zv);
+	ZVAL_LONG(zv, (long) period_obj->recurrences);
+	zend_hash_update(props, "recurrences", sizeof("recurrences"), &zv, sizeof(zv), NULL);
+
+	MAKE_STD_ZVAL(zv);
+	ZVAL_BOOL(zv, period_obj->include_start_date);
+	zend_hash_update(props, "include_start_date", sizeof("include_start_date"), &zv, sizeof(zv), NULL);
+
+	return props;
+}
+
+static int php_date_period_initialize_from_hash(php_period_obj *period_obj, HashTable *myht TSRMLS_DC)
+{
+	zval **ht_entry;
+
+	/* this function does no rollback on error */
+
+	if (zend_hash_find(myht, "start", sizeof("start"), (void**) &ht_entry) == SUCCESS) {
+		if (Z_TYPE_PP(ht_entry) == IS_OBJECT && Z_OBJCE_PP(ht_entry) == date_ce_date) {
+			php_date_obj *date_obj;
+			date_obj = zend_object_store_get_object(*ht_entry TSRMLS_CC);
+			period_obj->start = timelib_time_clone(date_obj->time);
+		} else if (Z_TYPE_PP(ht_entry) != IS_NULL) {
+			return 0;
+		}
+	} else {
+		return 0;
+	}
+
+	if (zend_hash_find(myht, "end", sizeof("end"), (void**) &ht_entry) == SUCCESS) {
+		if (Z_TYPE_PP(ht_entry) == IS_OBJECT && Z_OBJCE_PP(ht_entry) == date_ce_date) {
+			php_date_obj *date_obj;
+			date_obj = zend_object_store_get_object(*ht_entry TSRMLS_CC);
+			period_obj->end = timelib_time_clone(date_obj->time);
+		} else if (Z_TYPE_PP(ht_entry) != IS_NULL) {
+			return 0;
+		}
+	} else {
+		return 0;
+	}
+
+	if (zend_hash_find(myht, "current", sizeof("current"), (void**) &ht_entry) == SUCCESS) {
+		if (Z_TYPE_PP(ht_entry) == IS_OBJECT && Z_OBJCE_PP(ht_entry) == date_ce_date) {
+			php_date_obj *date_obj;
+			date_obj = zend_object_store_get_object(*ht_entry TSRMLS_CC);
+			period_obj->current = timelib_time_clone(date_obj->time);
+		} else if (Z_TYPE_PP(ht_entry) != IS_NULL)  {
+			return 0;
+		}
+	} else {
+		return 0;
+	}
+
+	if (zend_hash_find(myht, "interval", sizeof("interval"), (void**) &ht_entry) == SUCCESS) {
+		if (Z_TYPE_PP(ht_entry) == IS_OBJECT && Z_OBJCE_PP(ht_entry) == date_ce_interval) {
+			php_interval_obj *interval_obj;
+			interval_obj = zend_object_store_get_object(*ht_entry TSRMLS_CC);
+			period_obj->interval = timelib_rel_time_clone(interval_obj->diff);
+		} else { /* interval is required */
+			return 0;
+		}
+	} else {
+		return 0;
+	}
+
+	if (zend_hash_find(myht, "recurrences", sizeof("recurrences"), (void**) &ht_entry) == SUCCESS &&
+			Z_TYPE_PP(ht_entry) == IS_LONG && Z_LVAL_PP(ht_entry) >= 0 && Z_LVAL_PP(ht_entry) <= INT_MAX) {
+		period_obj->recurrences = Z_LVAL_PP(ht_entry);
+	} else {
+		return 0;
+	}
+
+	if (zend_hash_find(myht, "include_start_date", sizeof("include_start_date"), (void**) &ht_entry) == SUCCESS &&
+			Z_TYPE_PP(ht_entry) == IS_BOOL) {
+		period_obj->include_start_date = Z_BVAL_PP(ht_entry);
+	} else {
+		return 0;
+	}
+
+	period_obj->initialized = 1;
+	
+	return 1;
+}
+
+/* {{{ proto DatePeriod::__set_state()
+*/
+PHP_METHOD(DatePeriod, __set_state)
+{
+	php_period_obj   *period_obj;
+	zval             *array;
+	HashTable        *myht;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &array) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	myht = Z_ARRVAL_P(array);
+	
+	object_init_ex(return_value, date_ce_period);
+	period_obj = zend_object_store_get_object(return_value TSRMLS_CC);
+	if (!php_date_period_initialize_from_hash(period_obj, myht TSRMLS_CC)) {
+		php_error(E_ERROR, "Invalid serialization data for DatePeriod object");
+	}
+}
+/* }}} */
+
+/* {{{ proto DatePeriod::__wakeup()
+*/
+PHP_METHOD(DatePeriod, __wakeup)
+{
+	zval             *object = getThis();
+	php_period_obj   *period_obj;
+	HashTable        *myht;
+
+	period_obj = zend_object_store_get_object(object TSRMLS_CC);
+
+	myht = Z_OBJPROP_P(object);
+
+	if (!php_date_period_initialize_from_hash(period_obj, myht TSRMLS_CC)) {
+		php_error(E_ERROR, "Invalid serialization data for DatePeriod object");
+	}
+}
+/* }}} */
+
+/* {{{ date_period_read_property */
+static zval *date_period_read_property(zval *object, zval *member, int type, const zend_literal *key TSRMLS_DC)
+{
+	zval *zv;
+	if (type != BP_VAR_IS && type != BP_VAR_R) {
+		php_error_docref(NULL TSRMLS_CC, E_ERROR, "Retrieval of DatePeriod properties for modification is unsupported");
+	}
+
+	Z_OBJPROP_P(object); /* build properties hash table */
+
+	zv = std_object_handlers.read_property(object, member, type, key TSRMLS_CC);
+	if (Z_TYPE_P(zv) == IS_OBJECT && Z_OBJ_HANDLER_P(zv, clone_obj)) {
+		/* defensive copy */
+		zend_object_value zov = Z_OBJ_HANDLER_P(zv, clone_obj)(zv TSRMLS_CC);
+		MAKE_STD_ZVAL(zv);
+		Z_TYPE_P(zv) = IS_OBJECT;
+		Z_OBJVAL_P(zv) = zov;
+	}
+
+	return zv;
+}
+/* }}} */
+
+/* {{{ date_period_write_property */
+static void date_period_write_property(zval *object, zval *member, zval *value, const zend_literal *key TSRMLS_DC)
+{
+	php_error_docref(NULL TSRMLS_CC, E_ERROR, "Writing to DatePeriod properties is unsupported");
+}
+/* }}} */
+
+
 /*
  * Local variables:
  * tab-width: 4
diff --git a/ext/date/php_date.h b/ext/date/php_date.h
index f0b662b5d..be0df38b6 100644
--- a/ext/date/php_date.h
+++ b/ext/date/php_date.h
@@ -88,6 +88,8 @@ PHP_FUNCTION(date_interval_format);
 PHP_FUNCTION(date_interval_create_from_date_string);
 
 PHP_METHOD(DatePeriod, __construct);
+PHP_METHOD(DatePeriod, __wakeup);
+PHP_METHOD(DatePeriod, __set_state);
 
 /* Options and Configuration */
 PHP_FUNCTION(date_default_timezone_set);
@@ -163,7 +165,7 @@ ZEND_END_MODULE_GLOBALS(date)
 #define DATEG(v) (date_globals.v)
 #endif
 
-/* Backwards compability wrapper */
+/* Backwards compatibility wrapper */
 PHPAPI signed long php_parse_date(char *string, signed long *now);
 PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt);
 PHPAPI int php_idate(char format, time_t ts, int localtime TSRMLS_DC);
diff --git a/ext/date/tests/DateInterval_days_prop1.phpt b/ext/date/tests/DateInterval_days_prop1.phpt
new file mode 100644
index 000000000..627b8f0b2
--- /dev/null
+++ b/ext/date/tests/DateInterval_days_prop1.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Wrong var_dump(DateInterval->days) value
+--FILE--
+<?php
+
+$interval = new DateInterval('P2Y4DT6H8M');
+
+var_dump($interval->days);
+--EXPECT--
+bool(false)
diff --git a/ext/date/tests/DateTime_fix_createFromFormat.phpt b/ext/date/tests/DateTime_fix_createFromFormat.phpt
new file mode 100644
index 000000000..abde29277
--- /dev/null
+++ b/ext/date/tests/DateTime_fix_createFromFormat.phpt
@@ -0,0 +1,29 @@
+--TEST--
+Test fix for DateTime when date have textual day with dot or other special char at end
+--FILE--
+<?php
+
+//Set the default time zone 
+date_default_timezone_set('Europe/London');
+
+echo "*** Testing clone on DateTime objects ***\n";
+
+// Create a DateTime object..
+$orig = new DateTime('2012-11-29 17:00:00');
+
+// String to parse
+$string = "Thu., Nov. 29, 2012 5:00PM";
+
+// Create a DateTime object from format
+$fromFormat = DateTime::createFromFormat( "D., M# j, Y g:iA", $string );
+
+echo "Format method: " . $orig->format("D., M. j, Y g:iA") . "\n";
+echo "createFromFormat method: " . $fromFormat->format("D., M. j, Y g:iA") . "\n";
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing clone on DateTime objects ***
+Format method: Thu., Nov. 29, 2012 5:00PM
+createFromFormat method: Thu., Nov. 29, 2012 5:00PM
+===DONE===
diff --git a/ext/date/tests/bug45682.phpt b/ext/date/tests/bug45682.phpt
index d8bbfc5a0..ea8fa9470 100644
--- a/ext/date/tests/bug45682.phpt
+++ b/ext/date/tests/bug45682.phpt
@@ -11,8 +11,8 @@ $other = new DateTime("31-July-2008");
 $diff = date_diff($date, $other);
 
 var_dump($diff);
---EXPECT--
-object(DateInterval)#3 (8) {
+--EXPECTF--
+object(DateInterval)#%d (15) {
   ["y"]=>
   int(0)
   ["m"]=>
@@ -25,8 +25,22 @@ object(DateInterval)#3 (8) {
   int(0)
   ["s"]=>
   int(0)
+  ["weekday"]=>
+  int(0)
+  ["weekday_behavior"]=>
+  int(0)
+  ["first_last_day_of"]=>
+  int(0)
   ["invert"]=>
   int(0)
   ["days"]=>
   int(3)
+  ["special_type"]=>
+  int(0)
+  ["special_amount"]=>
+  int(0)
+  ["have_weekday_relative"]=>
+  int(0)
+  ["have_special_relative"]=>
+  int(0)
 }
diff --git a/ext/date/tests/bug48678.phpt b/ext/date/tests/bug48678.phpt
index e2cb724f7..253cb84ce 100644
--- a/ext/date/tests/bug48678.phpt
+++ b/ext/date/tests/bug48678.phpt
@@ -15,8 +15,15 @@ DateInterval Object
     [h] => 12
     [i] => 30
     [s] => 5
+    [weekday] => 0
+    [weekday_behavior] => 0
+    [first_last_day_of] => 0
     [invert] => 0
-    [days] =>%s
+    [days] => 
+    [special_type] => 0
+    [special_amount] => 0
+    [have_weekday_relative] => 0
+    [have_special_relative] => 0
 )
 DateInterval Object
 (
@@ -26,6 +33,13 @@ DateInterval Object
     [h] => 12
     [i] => 30
     [s] => 5
+    [weekday] => 0
+    [weekday_behavior] => 0
+    [first_last_day_of] => 0
     [invert] => 0
-    [days] =>%s
+    [days] => 0
+    [special_type] => 0
+    [special_amount] => 0
+    [have_weekday_relative] => 0
+    [have_special_relative] => 0
 )
diff --git a/ext/date/tests/bug49081.phpt b/ext/date/tests/bug49081.phpt
index f4f02903d..31f735148 100644
--- a/ext/date/tests/bug49081.phpt
+++ b/ext/date/tests/bug49081.phpt
@@ -17,6 +17,13 @@ DateInterval Object
     [h] => 4
     [i] => 0
     [s] => 0
+    [weekday] => 0
+    [weekday_behavior] => 0
+    [first_last_day_of] => 0
     [invert] => 0
     [days] => 30
+    [special_type] => 0
+    [special_amount] => 0
+    [have_weekday_relative] => 0
+    [have_special_relative] => 0
 )
diff --git a/ext/date/tests/bug49778.phpt b/ext/date/tests/bug49778.phpt
index 67c8e27f9..2062d6916 100644
--- a/ext/date/tests/bug49778.phpt
+++ b/ext/date/tests/bug49778.phpt
@@ -8,7 +8,7 @@ echo $i->format("%d"), "\n";
 echo $i->format("%a"), "\n";
 ?>
 --EXPECT--
-object(DateInterval)#1 (8) {
+object(DateInterval)#1 (15) {
   ["y"]=>
   int(0)
   ["m"]=>
@@ -21,10 +21,24 @@ object(DateInterval)#1 (8) {
   int(0)
   ["s"]=>
   int(0)
+  ["weekday"]=>
+  int(0)
+  ["weekday_behavior"]=>
+  int(0)
+  ["first_last_day_of"]=>
+  int(0)
   ["invert"]=>
   int(0)
   ["days"]=>
   bool(false)
+  ["special_type"]=>
+  int(0)
+  ["special_amount"]=>
+  int(0)
+  ["have_weekday_relative"]=>
+  int(0)
+  ["have_special_relative"]=>
+  int(0)
 }
 7
 (unknown)
diff --git a/ext/date/tests/bug52062.phpt b/ext/date/tests/bug52062.phpt
index 1d814377c..81e767b0f 100644
--- a/ext/date/tests/bug52062.phpt
+++ b/ext/date/tests/bug52062.phpt
@@ -4,8 +4,6 @@ Bug #52062 (large timestamps with DateTime::getTimestamp and DateTime::setTimest
 <?php
 if (PHP_INT_SIZE == 8) die('skip 32-bit only');
 ?>
---XFAIL--
-Waiting for resolution of the 32-bit case.
 --INI--
 date.timezone=UTC
 --FILE--
diff --git a/ext/date/tests/bug52113.phpt b/ext/date/tests/bug52113.phpt
index a7d9339d1..f4730c6a4 100644
--- a/ext/date/tests/bug52113.phpt
+++ b/ext/date/tests/bug52113.phpt
@@ -32,7 +32,7 @@ var_dump($unser, $p);
 
 ?>
 --EXPECT--
-object(DateInterval)#3 (8) {
+object(DateInterval)#3 (15) {
   ["y"]=>
   int(0)
   ["m"]=>
@@ -45,12 +45,26 @@ object(DateInterval)#3 (8) {
   int(0)
   ["s"]=>
   int(0)
+  ["weekday"]=>
+  int(0)
+  ["weekday_behavior"]=>
+  int(0)
+  ["first_last_day_of"]=>
+  int(0)
   ["invert"]=>
   int(0)
   ["days"]=>
   int(0)
+  ["special_type"]=>
+  int(0)
+  ["special_amount"]=>
+  int(0)
+  ["have_weekday_relative"]=>
+  int(0)
+  ["have_special_relative"]=>
+  int(0)
 }
-string(128) "O:12:"DateInterval":8:{s:1:"y";i:0;s:1:"m";i:0;s:1:"d";i:0;s:1:"h";i:4;s:1:"i";i:0;s:1:"s";i:0;s:6:"invert";i:0;s:4:"days";i:0;}"
+string(320) "O:12:"DateInterval":15:{s:1:"y";i:0;s:1:"m";i:0;s:1:"d";i:0;s:1:"h";i:4;s:1:"i";i:0;s:1:"s";i:0;s:7:"weekday";i:0;s:16:"weekday_behavior";i:0;s:17:"first_last_day_of";i:0;s:6:"invert";i:0;s:4:"days";i:0;s:12:"special_type";i:0;s:14:"special_amount";i:0;s:21:"have_weekday_relative";i:0;s:21:"have_special_relative";i:0;}"
 DateInterval::__set_state(array(
    'y' => 0,
    'm' => 0,
@@ -58,9 +72,16 @@ DateInterval::__set_state(array(
    'h' => 4,
    'i' => 0,
    's' => 0,
+   'weekday' => 0,
+   'weekday_behavior' => 0,
+   'first_last_day_of' => 0,
    'invert' => 0,
    'days' => 0,
-))object(DateInterval)#5 (8) {
+   'special_type' => 0,
+   'special_amount' => 0,
+   'have_weekday_relative' => 0,
+   'have_special_relative' => 0,
+))object(DateInterval)#5 (15) {
   ["y"]=>
   int(0)
   ["m"]=>
@@ -73,14 +94,78 @@ DateInterval::__set_state(array(
   int(0)
   ["s"]=>
   int(0)
+  ["weekday"]=>
+  int(0)
+  ["weekday_behavior"]=>
+  int(0)
+  ["first_last_day_of"]=>
+  int(0)
   ["invert"]=>
   int(0)
   ["days"]=>
   int(0)
+  ["special_type"]=>
+  int(0)
+  ["special_amount"]=>
+  int(0)
+  ["have_weekday_relative"]=>
+  int(0)
+  ["have_special_relative"]=>
+  int(0)
 }
-object(DatePeriod)#6 (0) {
+object(DatePeriod)#6 (6) {
+  ["start"]=>
+  object(DateTime)#4 (3) {
+    ["date"]=>
+    string(19) "2003-01-02 08:00:00"
+    ["timezone_type"]=>
+    int(3)
+    ["timezone"]=>
+    string(3) "UTC"
+  }
+  ["current"]=>
+  NULL
+  ["end"]=>
+  NULL
+  ["interval"]=>
+  object(DateInterval)#7 (15) {
+    ["y"]=>
+    int(0)
+    ["m"]=>
+    int(0)
+    ["d"]=>
+    int(0)
+    ["h"]=>
+    int(4)
+    ["i"]=>
+    int(0)
+    ["s"]=>
+    int(0)
+    ["weekday"]=>
+    int(0)
+    ["weekday_behavior"]=>
+    int(0)
+    ["first_last_day_of"]=>
+    int(0)
+    ["invert"]=>
+    int(0)
+    ["days"]=>
+    int(0)
+    ["special_type"]=>
+    int(0)
+    ["special_amount"]=>
+    int(0)
+    ["have_weekday_relative"]=>
+    int(0)
+    ["have_special_relative"]=>
+    int(0)
+  }
+  ["recurrences"]=>
+  int(3)
+  ["include_start_date"]=>
+  bool(true)
 }
-object(DateInterval)#4 (8) {
+object(DateInterval)#8 (15) {
   ["y"]=>
   int(7)
   ["m"]=>
@@ -93,10 +178,74 @@ object(DateInterval)#4 (8) {
   int(3)
   ["s"]=>
   int(2)
+  ["weekday"]=>
+  int(-1)
+  ["weekday_behavior"]=>
+  int(-1)
+  ["first_last_day_of"]=>
+  int(-1)
   ["invert"]=>
   int(1)
   ["days"]=>
   int(2400)
+  ["special_type"]=>
+  int(0)
+  ["special_amount"]=>
+  int(-1)
+  ["have_weekday_relative"]=>
+  int(0)
+  ["have_special_relative"]=>
+  int(0)
 }
-object(DatePeriod)#7 (0) {
+object(DatePeriod)#9 (6) {
+  ["start"]=>
+  object(DateTime)#6 (3) {
+    ["date"]=>
+    string(19) "2003-01-02 08:00:00"
+    ["timezone_type"]=>
+    int(3)
+    ["timezone"]=>
+    string(3) "UTC"
+  }
+  ["current"]=>
+  NULL
+  ["end"]=>
+  NULL
+  ["interval"]=>
+  object(DateInterval)#7 (15) {
+    ["y"]=>
+    int(0)
+    ["m"]=>
+    int(0)
+    ["d"]=>
+    int(0)
+    ["h"]=>
+    int(4)
+    ["i"]=>
+    int(0)
+    ["s"]=>
+    int(0)
+    ["weekday"]=>
+    int(0)
+    ["weekday_behavior"]=>
+    int(0)
+    ["first_last_day_of"]=>
+    int(0)
+    ["invert"]=>
+    int(0)
+    ["days"]=>
+    int(0)
+    ["special_type"]=>
+    int(0)
+    ["special_amount"]=>
+    int(0)
+    ["have_weekday_relative"]=>
+    int(0)
+    ["have_special_relative"]=>
+    int(0)
+  }
+  ["recurrences"]=>
+  int(3)
+  ["include_start_date"]=>
+  bool(true)
 }
diff --git a/ext/date/tests/bug52738.phpt b/ext/date/tests/bug52738.phpt
index fc1b6029e..ea219f7c7 100644
--- a/ext/date/tests/bug52738.phpt
+++ b/ext/date/tests/bug52738.phpt
@@ -27,6 +27,13 @@ di Object
     [h] => 0
     [i] => 0
     [s] => 0
+    [weekday] => 0
+    [weekday_behavior] => 0
+    [first_last_day_of] => 0
     [invert] => 0
     [days] => 
+    [special_type] => 0
+    [special_amount] => 0
+    [have_weekday_relative] => 0
+    [have_special_relative] => 0
 )
diff --git a/ext/date/tests/bug52808.phpt b/ext/date/tests/bug52808.phpt
index e031ac6ee..1f0fc84cd 100644
--- a/ext/date/tests/bug52808.phpt
+++ b/ext/date/tests/bug52808.phpt
@@ -25,7 +25,7 @@ foreach($intervals as $iv) {
 echo "==DONE==\n";
 ?>
 --EXPECTF--
-object(DateInterval)#%d (8) {
+object(DateInterval)#%d (15) {
   ["y"]=>
   int(1)
   ["m"]=>
@@ -38,12 +38,26 @@ object(DateInterval)#%d (8) {
   int(30)
   ["s"]=>
   int(0)
+  ["weekday"]=>
+  int(0)
+  ["weekday_behavior"]=>
+  int(0)
+  ["first_last_day_of"]=>
+  int(0)
   ["invert"]=>
   int(1)
   ["days"]=>
   int(437)
+  ["special_type"]=>
+  int(0)
+  ["special_amount"]=>
+  int(0)
+  ["have_weekday_relative"]=>
+  int(0)
+  ["have_special_relative"]=>
+  int(0)
 }
-object(DateInterval)#%d (8) {
+object(DateInterval)#%d (15) {
   ["y"]=>
   int(0)
   ["m"]=>
@@ -56,12 +70,26 @@ object(DateInterval)#%d (8) {
   int(30)
   ["s"]=>
   int(0)
+  ["weekday"]=>
+  int(0)
+  ["weekday_behavior"]=>
+  int(0)
+  ["first_last_day_of"]=>
+  int(0)
   ["invert"]=>
   int(0)
   ["days"]=>
   int(294)
+  ["special_type"]=>
+  int(0)
+  ["special_amount"]=>
+  int(0)
+  ["have_weekday_relative"]=>
+  int(0)
+  ["have_special_relative"]=>
+  int(0)
 }
-object(DateInterval)#%d (8) {
+object(DateInterval)#%d (15) {
   ["y"]=>
   int(0)
   ["m"]=>
@@ -74,10 +102,24 @@ object(DateInterval)#%d (8) {
   int(30)
   ["s"]=>
   int(0)
+  ["weekday"]=>
+  int(0)
+  ["weekday_behavior"]=>
+  int(0)
+  ["first_last_day_of"]=>
+  int(0)
   ["invert"]=>
   int(0)
   ["days"]=>
   int(294)
+  ["special_type"]=>
+  int(0)
+  ["special_amount"]=>
+  int(0)
+  ["have_weekday_relative"]=>
+  int(0)
+  ["have_special_relative"]=>
+  int(0)
 }
 DateInterval::__construct(): Failed to parse interval (2007-05-11T15:30:00Z/)
 DateInterval::__construct(): Failed to parse interval (2007-05-11T15:30:00Z)
diff --git a/ext/date/tests/bug53437.phpt b/ext/date/tests/bug53437.phpt
index f08986653..2ea091453 100644
--- a/ext/date/tests/bug53437.phpt
+++ b/ext/date/tests/bug53437.phpt
@@ -1,7 +1,5 @@
 --TEST--
-Bug #53437 (Crash when using unserialized DatePeriod instance)
---XFAIL--
-Bug #53437 Not fixed yet
+Bug #53437 (Crash when using unserialized DatePeriod instance), variation 1
 --FILE--
 <?php
 $dp = new DatePeriod(new DateTime('2010-01-01 UTC'), new DateInterval('P1D'), 2);
@@ -20,9 +18,137 @@ $dpu = unserialize($ser); // $dpu has invalid values???
 var_dump($dpu);
 
 echo "Unserialized:\r\n";
-// ???which leads to CRASH:
 foreach($dpu as $dt) {
         echo $dt->format('Y-m-d H:i:s')."\r\n";
 }
 ?>
+==DONE==
 --EXPECT--
+Original:
+2010-01-01 00:00:00
+2010-01-02 00:00:00
+2010-01-03 00:00:00
+
+object(DatePeriod)#1 (6) {
+  ["start"]=>
+  object(DateTime)#2 (3) {
+    ["date"]=>
+    string(19) "2010-01-01 00:00:00"
+    ["timezone_type"]=>
+    int(3)
+    ["timezone"]=>
+    string(3) "UTC"
+  }
+  ["current"]=>
+  object(DateTime)#4 (3) {
+    ["date"]=>
+    string(19) "2010-01-04 00:00:00"
+    ["timezone_type"]=>
+    int(3)
+    ["timezone"]=>
+    string(3) "UTC"
+  }
+  ["end"]=>
+  NULL
+  ["interval"]=>
+  object(DateInterval)#5 (15) {
+    ["y"]=>
+    int(0)
+    ["m"]=>
+    int(0)
+    ["d"]=>
+    int(1)
+    ["h"]=>
+    int(0)
+    ["i"]=>
+    int(0)
+    ["s"]=>
+    int(0)
+    ["weekday"]=>
+    int(0)
+    ["weekday_behavior"]=>
+    int(0)
+    ["first_last_day_of"]=>
+    int(0)
+    ["invert"]=>
+    int(0)
+    ["days"]=>
+    bool(false)
+    ["special_type"]=>
+    int(0)
+    ["special_amount"]=>
+    int(0)
+    ["have_weekday_relative"]=>
+    int(0)
+    ["have_special_relative"]=>
+    int(0)
+  }
+  ["recurrences"]=>
+  int(3)
+  ["include_start_date"]=>
+  bool(true)
+}
+object(DatePeriod)#5 (6) {
+  ["start"]=>
+  object(DateTime)#10 (3) {
+    ["date"]=>
+    string(19) "2010-01-01 00:00:00"
+    ["timezone_type"]=>
+    int(3)
+    ["timezone"]=>
+    string(3) "UTC"
+  }
+  ["current"]=>
+  object(DateTime)#7 (3) {
+    ["date"]=>
+    string(19) "2010-01-04 00:00:00"
+    ["timezone_type"]=>
+    int(3)
+    ["timezone"]=>
+    string(3) "UTC"
+  }
+  ["end"]=>
+  NULL
+  ["interval"]=>
+  object(DateInterval)#8 (15) {
+    ["y"]=>
+    int(0)
+    ["m"]=>
+    int(0)
+    ["d"]=>
+    int(1)
+    ["h"]=>
+    int(0)
+    ["i"]=>
+    int(0)
+    ["s"]=>
+    int(0)
+    ["weekday"]=>
+    int(0)
+    ["weekday_behavior"]=>
+    int(0)
+    ["first_last_day_of"]=>
+    int(0)
+    ["invert"]=>
+    int(0)
+    ["days"]=>
+    int(0)
+    ["special_type"]=>
+    int(0)
+    ["special_amount"]=>
+    int(0)
+    ["have_weekday_relative"]=>
+    int(0)
+    ["have_special_relative"]=>
+    int(0)
+  }
+  ["recurrences"]=>
+  int(3)
+  ["include_start_date"]=>
+  bool(true)
+}
+Unserialized:
+2010-01-01 00:00:00
+2010-01-02 00:00:00
+2010-01-03 00:00:00
+==DONE==
diff --git a/ext/date/tests/bug53437_var1.phpt b/ext/date/tests/bug53437_var1.phpt
new file mode 100644
index 000000000..f1f9843d5
--- /dev/null
+++ b/ext/date/tests/bug53437_var1.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Bug #53437 (Crash when using unserialized DatePeriod instance), variation 2
+--FILE--
+<?php
+$s = 'O:10:"DatePeriod":0:{}';
+
+$dp = unserialize($s);
+
+var_dump($dp);
+?>
+==DONE==
+--EXPECTF--
+Fatal error: Invalid serialization data for DatePeriod object in %sbug53437_var1.php on line %d
diff --git a/ext/date/tests/bug53437_var2.phpt b/ext/date/tests/bug53437_var2.phpt
new file mode 100644
index 000000000..50aebda57
--- /dev/null
+++ b/ext/date/tests/bug53437_var2.phpt
@@ -0,0 +1,80 @@
+--TEST--
+Bug #53437 DateInterval basic serialization
+--FILE--
+<?php
+$di0 = new DateInterval('P2Y4DT6H8M');
+
+$s = serialize($di0);
+
+$di1 = unserialize($s);
+
+var_dump($di0, $di1);
+
+?>
+==DONE==
+--EXPECT--
+object(DateInterval)#1 (15) {
+  ["y"]=>
+  int(2)
+  ["m"]=>
+  int(0)
+  ["d"]=>
+  int(4)
+  ["h"]=>
+  int(6)
+  ["i"]=>
+  int(8)
+  ["s"]=>
+  int(0)
+  ["weekday"]=>
+  int(0)
+  ["weekday_behavior"]=>
+  int(0)
+  ["first_last_day_of"]=>
+  int(0)
+  ["invert"]=>
+  int(0)
+  ["days"]=>
+  bool(false)
+  ["special_type"]=>
+  int(0)
+  ["special_amount"]=>
+  int(0)
+  ["have_weekday_relative"]=>
+  int(0)
+  ["have_special_relative"]=>
+  int(0)
+}
+object(DateInterval)#2 (15) {
+  ["y"]=>
+  int(2)
+  ["m"]=>
+  int(0)
+  ["d"]=>
+  int(4)
+  ["h"]=>
+  int(6)
+  ["i"]=>
+  int(8)
+  ["s"]=>
+  int(0)
+  ["weekday"]=>
+  int(0)
+  ["weekday_behavior"]=>
+  int(0)
+  ["first_last_day_of"]=>
+  int(0)
+  ["invert"]=>
+  int(0)
+  ["days"]=>
+  int(0)
+  ["special_type"]=>
+  int(0)
+  ["special_amount"]=>
+  int(0)
+  ["have_weekday_relative"]=>
+  int(0)
+  ["have_special_relative"]=>
+  int(0)
+}
+==DONE==
diff --git a/ext/date/tests/bug53437_var3.phpt b/ext/date/tests/bug53437_var3.phpt
new file mode 100644
index 000000000..82b90f559
--- /dev/null
+++ b/ext/date/tests/bug53437_var3.phpt
@@ -0,0 +1,47 @@
+--TEST--
+Bug #53437 DateInterval unserialize bad data, 32 bit
+--SKIPIF--
+<?php if (PHP_INT_SIZE != 4) { die('skip 32 bit only'); } ?>
+--FILE--
+<?php
+$s = 'O:12:"DateInterval":15:{s:1:"y";s:1:"2";s:1:"m";s:1:"0";s:1:"d";s:3:"bla";s:1:"h";s:1:"6";s:1:"i";s:1:"8";s:1:"s";s:1:"0";s:7:"weekday";i:10;s:16:"weekday_behavior";i:10;s:17:"first_last_day_of";i:0;s:6:"invert";i:0;s:4:"days";s:4:"aoeu";s:12:"special_type";i:0;s:14:"special_amount";s:21:"234523452345234532455";s:21:"have_weekday_relative";i:21474836489;s:21:"have_special_relative";s:3:"bla";}';
+
+$di = unserialize($s);
+var_dump($di);
+
+?>
+==DONE==
+--EXPECTF--
+object(DateInterval)#%d (15) {
+  ["y"]=>
+  int(2)
+  ["m"]=>
+  int(0)
+  ["d"]=>
+  int(0)
+  ["h"]=>
+  int(6)
+  ["i"]=>
+  int(8)
+  ["s"]=>
+  int(0)
+  ["weekday"]=>
+  int(10)
+  ["weekday_behavior"]=>
+  int(10)
+  ["first_last_day_of"]=>
+  int(0)
+  ["invert"]=>
+  int(0)
+  ["days"]=>
+  int(0)
+  ["special_type"]=>
+  int(0)
+  ["special_amount"]=>
+  int(-1)
+  ["have_weekday_relative"]=>
+  int(9)
+  ["have_special_relative"]=>
+  int(0)
+}
+==DONE==
diff --git a/ext/date/tests/bug53437_var4.phpt b/ext/date/tests/bug53437_var4.phpt
new file mode 100644
index 000000000..88fd81c9d
--- /dev/null
+++ b/ext/date/tests/bug53437_var4.phpt
@@ -0,0 +1,64 @@
+--TEST--
+Bug #53437 (Check that var_dump out is the same using the whole object or it's single properties), variation 4
+--INI--
+date.timezone = Europe/Berlin
+--FILE--
+<?php
+$dt = new DateTime('2009-10-11');
+
+$df = $dt->diff(new DateTime('2009-10-13'));
+
+var_dump($df,
+	$df->y,
+	$df->m,
+	$df->d,
+	$df->h,
+	$df->i,
+	$df->s,
+	$df->invert,
+	$df->days);
+
+?>
+==DONE==
+--EXPECTF--
+object(DateInterval)#%d (15) {
+  ["y"]=>
+  int(0)
+  ["m"]=>
+  int(0)
+  ["d"]=>
+  int(2)
+  ["h"]=>
+  int(0)
+  ["i"]=>
+  int(0)
+  ["s"]=>
+  int(0)
+  ["weekday"]=>
+  int(0)
+  ["weekday_behavior"]=>
+  int(0)
+  ["first_last_day_of"]=>
+  int(0)
+  ["invert"]=>
+  int(0)
+  ["days"]=>
+  int(2)
+  ["special_type"]=>
+  int(0)
+  ["special_amount"]=>
+  int(0)
+  ["have_weekday_relative"]=>
+  int(0)
+  ["have_special_relative"]=>
+  int(0)
+}
+int(0)
+int(0)
+int(2)
+int(0)
+int(0)
+int(0)
+int(0)
+int(2)
+==DONE==
diff --git a/ext/date/tests/bug53437_var5.phpt b/ext/date/tests/bug53437_var5.phpt
new file mode 100644
index 000000000..e95fcdae9
--- /dev/null
+++ b/ext/date/tests/bug53437_var5.phpt
@@ -0,0 +1,47 @@
+--TEST--
+Bug #53437 DateInterval unserialize bad data, 64 bit
+--SKIPIF--
+<?php if (PHP_INT_SIZE != 8) { die('skip true 64 bit only'); } ?>
+--FILE--
+<?php
+$s = 'O:12:"DateInterval":15:{s:1:"y";s:1:"2";s:1:"m";s:1:"0";s:1:"d";s:3:"bla";s:1:"h";s:1:"6";s:1:"i";s:1:"8";s:1:"s";s:1:"0";s:7:"weekday";i:10;s:16:"weekday_behavior";i:10;s:17:"first_last_day_of";i:0;s:6:"invert";i:0;s:4:"days";s:4:"aoeu";s:12:"special_type";i:0;s:14:"special_amount";s:21:"234523452345234532455";s:21:"have_weekday_relative";i:21474836489;s:21:"have_special_relative";s:3:"bla";}';
+
+$di = unserialize($s);
+var_dump($di);
+
+?>
+==DONE==
+--EXPECTF--
+object(DateInterval)#%d (15) {
+  ["y"]=>
+  int(2)
+  ["m"]=>
+  int(0)
+  ["d"]=>
+  int(0)
+  ["h"]=>
+  int(6)
+  ["i"]=>
+  int(8)
+  ["s"]=>
+  int(0)
+  ["weekday"]=>
+  int(10)
+  ["weekday_behavior"]=>
+  int(10)
+  ["first_last_day_of"]=>
+  int(0)
+  ["invert"]=>
+  int(0)
+  ["days"]=>
+  int(0)
+  ["special_type"]=>
+  int(0)
+  ["special_amount"]=>
+  int(9223372036854775807)
+  ["have_weekday_relative"]=>
+  int(9)
+  ["have_special_relative"]=>
+  int(0)
+}
+==DONE==
diff --git a/ext/date/tests/bug55397.phpt b/ext/date/tests/bug55397.phpt
index 13778a00b..7c9bbb01c 100644
--- a/ext/date/tests/bug55397.phpt
+++ b/ext/date/tests/bug55397.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #55397 (comparsion of incomplete DateTime causes SIGSEGV)
+Bug #55397 (comparison of incomplete DateTime causes SIGSEGV)
 --INI--
 --FILE--
 <?php
diff --git a/ext/date/tests/bug64157.phpt b/ext/date/tests/bug64157.phpt
new file mode 100644
index 000000000..fb7149543
--- /dev/null
+++ b/ext/date/tests/bug64157.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Test for bug #64157: DateTime::createFromFormat() reports confusing error message
+--CREDITS--
+Boro Sitnikovski <buritomath@yahoo.com>
+--INI--
+date.timezone = UTC
+--FILE--
+<?php
+DateTime::createFromFormat('s', '0');
+$lastErrors = DateTime::getLastErrors();
+print_r($lastErrors['errors'][0]);
+?>
+--EXPECT--
+A two digit second could not be found
diff --git a/ext/date/tests/date_diff1.phpt b/ext/date/tests/date_diff1.phpt
index cf32fcbf3..a908cdba7 100644
--- a/ext/date/tests/date_diff1.phpt
+++ b/ext/date/tests/date_diff1.phpt
@@ -28,7 +28,7 @@ object(DateTime)#2 (3) {
   ["timezone"]=>
   string(3) "EDT"
 }
-object(DateInterval)#3 (8) {
+object(DateInterval)#3 (15) {
   ["y"]=>
   int(0)
   ["m"]=>
@@ -41,8 +41,22 @@ object(DateInterval)#3 (8) {
   int(19)
   ["s"]=>
   int(40)
+  ["weekday"]=>
+  int(0)
+  ["weekday_behavior"]=>
+  int(0)
+  ["first_last_day_of"]=>
+  int(0)
   ["invert"]=>
   int(0)
   ["days"]=>
   int(33)
+  ["special_type"]=>
+  int(0)
+  ["special_amount"]=>
+  int(0)
+  ["have_weekday_relative"]=>
+  int(0)
+  ["have_special_relative"]=>
+  int(0)
 }
diff --git a/ext/date/tests/date_sunrise_and_sunset_basic.phpt b/ext/date/tests/date_sunrise_and_sunset_basic.phpt
index a96fa8303..f89b63fd9 100644
--- a/ext/date/tests/date_sunrise_and_sunset_basic.phpt
+++ b/ext/date/tests/date_sunrise_and_sunset_basic.phpt
@@ -14,7 +14,7 @@ offset: +1 GMT
 
 echo "Basic test for date_sunrise() and date_sunset()\n";
 
-// supress date() function strict msgs 
+// suppress date() function strict msgs 
 error_reporting(E_ALL & ~E_STRICT);
 
 echo date("D M d Y") . ', sunrise time : ' . date_sunrise(time(), SUNFUNCS_RET_STRING, 38.4, -9, 90, 1) . "\n";
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 303d65c33..50a94dd2a 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -226,12 +226,17 @@ static size_t php_dba_make_key(zval *key, char **key_str, char **key_free TSRMLS
 		*key_free = *key_str;
 		return len;
 	} else {
-		*key_free = NULL;
+		zval tmp = *key;
+		int len;
 
-		convert_to_string(key);
-		*key_str = Z_STRVAL_P(key);
+		zval_copy_ctor(&tmp);
+		convert_to_string(&tmp);
 
-		return Z_STRLEN_P(key);
+		*key_free = *key_str = estrndup(Z_STRVAL(tmp), Z_STRLEN(tmp));
+		len = Z_STRLEN(tmp);
+
+		zval_dtor(&tmp);
+		return len;
 	}
 }
 /* }}} */
@@ -297,6 +302,14 @@ static size_t php_dba_make_key(zval *key, char **key_str, char **key_free TSRMLS
 		RETURN_FALSE; \
 	}
 
+/* the same check, but with a call to DBA_ID_DONE before returning */
+#define DBA_WRITE_CHECK_WITH_ID \
+	if(info->mode != DBA_WRITER && info->mode != DBA_TRUNC && info->mode != DBA_CREAT) { \
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "You cannot perform a modification to a database without proper access"); \
+		DBA_ID_DONE; \
+		RETURN_FALSE; \
+	}
+
 /* }}} */
 
 /* {{{ globals */
@@ -538,7 +551,6 @@ PHP_MINFO_FUNCTION(dba)
  */
 static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode)
 {
-	char *v;
 	int val_len;
 	zval *id;
 	dba_info *info = NULL;
@@ -558,7 +570,7 @@ static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode)
 
 	DBA_FETCH_RESOURCE(info, &id);
 
-	DBA_WRITE_CHECK;
+	DBA_WRITE_CHECK_WITH_ID;
 
 	if (info->hnd->update(info, key_str, key_len, val, val_len, mode TSRMLS_CC) == SUCCESS) {
 		DBA_ID_DONE;
@@ -889,7 +901,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 			RETURN_FALSE;
 		}
 		if (hptr->flags & (DBA_NO_APPEND|DBA_CAST_AS_FD)) {
-			/* Needed becasue some systems do not allow to write to the original 
+			/* Needed because some systems do not allow to write to the original 
 			 * file contents with O_APPEND being set.
 			 */
 			if (SUCCESS != php_stream_cast(info->fp, PHP_STREAM_AS_FD, (void*)&info->fd, 1)) {
@@ -1111,7 +1123,7 @@ PHP_FUNCTION(dba_delete)
 {
 	DBA_ID_GET2;
 	
-	DBA_WRITE_CHECK;
+	DBA_WRITE_CHECK_WITH_ID;
 	
 	if(info->hnd->delete(info, key_str, key_len TSRMLS_CC) == SUCCESS)
 	{
diff --git a/ext/dba/libinifile/inifile.c b/ext/dba/libinifile/inifile.c
index 89373b1e3..3cd97702b 100644
--- a/ext/dba/libinifile/inifile.c
+++ b/ext/dba/libinifile/inifile.c
@@ -460,7 +460,7 @@ static int inifile_filter(inifile *dba, inifile *from, const key_type *key TSRML
  */
 static int inifile_delete_replace_append(inifile *dba, const key_type *key, const val_type *value, int append TSRMLS_DC) 
 {
-	size_t pos_grp_start, pos_grp_next;
+	size_t pos_grp_start = 0, pos_grp_next;
 	inifile *ini_tmp = NULL;
 	php_stream *fp_tmp = NULL;
 	int ret;
diff --git a/ext/dba/tests/bug38698.phpt b/ext/dba/tests/bug38698.phpt
index 56dde8526..1d1ed674f 100644
--- a/ext/dba/tests/bug38698.phpt
+++ b/ext/dba/tests/bug38698.phpt
@@ -8,10 +8,18 @@ Bug #38698 (Bug #38698 for some keys cdbmake creates corrupted db and cdb can't
 --FILE--
 <?php
 
+function isLittleEndian() {
+    return 0x00FF === current(unpack('v', pack('S',0x00FF)));
+}
+
 $db_file = dirname(__FILE__) .'/129php.cdb';
 
 if (($db_make=dba_open($db_file, "n", 'cdb_make'))!==FALSE) {
-	dba_insert(pack('i',129), "Booo!", $db_make);
+	if (isLittleEndian() === FALSE) {
+        dba_insert(pack('V',129), "Booo!", $db_make);
+	} else{
+		dba_insert(pack('i',129), "Booo!", $db_make);
+	}
 	dba_close($db_make);
 	// write md5 checksum of generated database file
 	var_dump(md5_file($db_file));
diff --git a/ext/dba/tests/bug65708.phpt b/ext/dba/tests/bug65708.phpt
new file mode 100644
index 000000000..b77138f6e
--- /dev/null
+++ b/ext/dba/tests/bug65708.phpt
@@ -0,0 +1,38 @@
+--TEST--
+Bug #65708 (dba functions cast $key param to string in-place, bypassing copy on write)
+--SKIPIF--
+<?php 
+	require_once(dirname(__FILE__) .'/skipif.inc');
+?>
+--FILE--
+<?php
+
+error_reporting(E_ALL);
+
+require_once(dirname(__FILE__) .'/test.inc');
+
+$db = dba_popen($db_filename, 'c');
+
+$key = 1;
+$copy = $key;
+
+echo gettype($key)."\n";
+echo gettype($copy)."\n";
+
+dba_exists($key, $db);
+
+echo gettype($key)."\n";
+echo gettype($copy)."\n";
+
+dba_close($db);
+
+?>
+--CLEAN--
+<?php 
+	require(dirname(__FILE__) .'/clean.inc'); 
+?>
+--EXPECT--
+integer
+integer
+integer
+integer
diff --git a/ext/dba/tests/dba_cdb_read.phpt b/ext/dba/tests/dba_cdb_read.phpt
index 71575f5d8..a782a572e 100644
--- a/ext/dba/tests/dba_cdb_read.phpt
+++ b/ext/dba/tests/dba_cdb_read.phpt
@@ -20,7 +20,7 @@ DBA CDB handler test (read only)
 			$keys .= $a;
 			$count++;
 		}
-		// display number of entries and key existance
+		// display number of entries and key existence
 		echo $count;
 		for ($i=1; $i<8; $i++) {
 			echo dba_exists($i, $db_file) ? "Y" : "N";
diff --git a/ext/dba/tests/dba_gdbm.phpt b/ext/dba/tests/dba_gdbm.phpt
index 33d7d2061..8ac3f6474 100644
--- a/ext/dba/tests/dba_gdbm.phpt
+++ b/ext/dba/tests/dba_gdbm.phpt
@@ -12,7 +12,7 @@ DBA GDBM handler test
 	$lock_flag = ''; // lock in library
 	require_once dirname(__FILE__) .'/dba_handler.inc';
 	
-	// Read during write is system dependant. Important is that there is no deadlock
+	// Read during write is system dependent. Important is that there is no deadlock
 ?>
 ===DONE===
 --EXPECTF--
diff --git a/ext/dom/element.c b/ext/dom/element.c
index f217ca245..606a23f9c 100644
--- a/ext/dom/element.c
+++ b/ext/dom/element.c
@@ -177,7 +177,7 @@ PHP_METHOD(domelement, __construct)
 		RETURN_FALSE;
 	}
 
-	/* Namespace logic is seperate and only when uri passed in to insure no BC breakage */
+	/* Namespace logic is separate and only when uri passed in to insure no BC breakage */
 	if (uri_len > 0) {
 		errorcode = dom_check_qname(name, &localname, &prefix, uri_len, name_len);
 		if (errorcode == 0) {
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index c3b0ee037..bd9c98756 100644
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -1089,7 +1089,11 @@ void dom_xpath_objects_free_storage(void *object TSRMLS_DC)
 void dom_objects_free_storage(void *object TSRMLS_DC)
 {
 	dom_object *intern = (dom_object *)object;
+#if defined(__GNUC__) && __GNUC__ >= 3
+	int retcount __attribute__((unused)); /* keep compiler quiet */
+#else
 	int retcount;
+#endif
 
 	zend_object_std_dtor(&intern->std TSRMLS_CC);
 
diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile.phpt
new file mode 100644
index 000000000..93a614903
--- /dev/null
+++ b/ext/dom/tests/DOMDocument_loadHTMLfile.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Test DOMDocument::loadHTMLFile
+--DESCRIPTION--
+Verifies the basic behaviour of the method
+--CREDITS--
+Antonio Diaz Ruiz <dejalatele@gmail.com>
+--INI--
+assert.bail=true
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--FILE--
+<?php
+$doc = new DOMDocument();
+$result = $doc->loadHTMLFile(dirname(__FILE__) . "/test.html");
+assert('$result === true');
+?>
+--EXPECT--
diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile_error1.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile_error1.phpt
new file mode 100644
index 000000000..aee51966a
--- /dev/null
+++ b/ext/dom/tests/DOMDocument_loadHTMLfile_error1.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Test DOMDocument::loadHTMLFile when the file doesn't exist
+--DESCRIPTION--
+Verifies that an error message is showed if the file doesn't exist
+--CREDITS--
+Antonio Diaz Ruiz <dejalatele@gmail.com>
+--INI--
+assert.bail=true
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--FILE--
+<?php
+$doc = new DOMDocument();
+$result = $doc->loadHTMLFile(dirname(__FILE__) . "/ffff/test.html");
+assert('$result === false');
+?>
+--EXPECTF--
+%r(PHP ){0,1}%rWarning: DOMDocument::loadHTMLFile(): I/O warning : failed to load external entity %s
diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt
new file mode 100644
index 000000000..e59ff56c5
--- /dev/null
+++ b/ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Test DOMDocument::loadHTMLFile when an empty string is passed
+--DESCRIPTION--
+Verifies that an error message is showed if an empty string is passed as argument
+--CREDITS--
+Antonio Diaz Ruiz <dejalatele@gmail.com>
+--INI--
+assert.bail=true
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--FILE--
+<?php
+$doc = new DOMDocument();
+$result = $doc->loadHTMLFile("");
+assert('$result === false');
+?>
+--EXPECTF--
+%r(PHP ){0,1}%rWarning: DOMDocument::loadHTMLFile(): Empty string supplied as input %s
diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt
new file mode 100644
index 000000000..2535772c7
--- /dev/null
+++ b/ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Test DOMDocument::loadHTMLFile when an empty document is loaded
+--DESCRIPTION--
+Verifies that an warning message is showed if an empty document is loaded
+--CREDITS--
+Antonio Diaz Ruiz <dejalatele@gmail.com>
+--INI--
+assert.bail=true
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--FILE--
+<?php
+$doc = new DOMDocument();
+$result = $doc->loadHTMLFile(dirname(__FILE__) . "/empty.html");
+assert('$result === true');
+?>
+--EXPECTF--
+%r(PHP ){0,1}%rWarning: DOMDocument::loadHTMLFile(): Document is empty %s
diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile_variation2.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile_variation2.phpt
new file mode 100644
index 000000000..829686dd6
--- /dev/null
+++ b/ext/dom/tests/DOMDocument_loadHTMLfile_variation2.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Test DOMDocument::loadHTMLFile when a not-well formed document is loaded
+--DESCRIPTION--
+Verifies the behavior if a not-well formed document is loaded
+--CREDITS--
+Antonio Diaz Ruiz <dejalatele@gmail.com>
+--INI--
+assert.bail=true
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--FILE--
+<?php
+$doc = new DOMDocument();
+$result = $doc->loadHTMLFile(dirname(__FILE__) . "/not_well.html");
+assert('$result === true');
+?>
+--EXPECT--
diff --git a/ext/dom/tests/DOMDocument_schemaValidate_error5.phpt b/ext/dom/tests/DOMDocument_schemaValidate_error5.phpt
index d3f0658c1..d5743bc6c 100644
--- a/ext/dom/tests/DOMDocument_schemaValidate_error5.phpt
+++ b/ext/dom/tests/DOMDocument_schemaValidate_error5.phpt
@@ -1,5 +1,5 @@
 --TEST--
-DomDocument::schemaValidate() - non-existant schema file
+DomDocument::schemaValidate() - non-existent schema file
 --CREDITS--
 Daniel Convissor <danielc@php.net>
 # TestFest 2009 NYPHP
@@ -12,14 +12,14 @@ $doc = new DOMDocument;
 
 $doc->load(dirname(__FILE__)."/book.xml");
 
-$result = $doc->schemaValidate(dirname(__FILE__)."/non-existant-file");
+$result = $doc->schemaValidate(dirname(__FILE__)."/non-existent-file");
 var_dump($result);
 
 ?>
 --EXPECTF--
-Warning: DOMDocument::schemaValidate(): I/O warning : failed to load external entity "%snon-existant-file" in %s.php on line %d
+Warning: DOMDocument::schemaValidate(): I/O warning : failed to load external entity "%snon-existent-file" in %s.php on line %d
 
-Warning: DOMDocument::schemaValidate(): Failed to locate the main schema resource at '%s/non-existant-file'. in %s.php on line %d
+Warning: DOMDocument::schemaValidate(): Failed to locate the main schema resource at '%s/non-existent-file'. in %s.php on line %d
 
 Warning: DOMDocument::schemaValidate(): Invalid Schema in %s.php on line %d
 bool(false)
diff --git a/ext/dom/tests/DOMNode_removeChild_basic.phpt b/ext/dom/tests/DOMNode_removeChild_basic.phpt
index 384eb47b5..fb0977488 100644
--- a/ext/dom/tests/DOMNode_removeChild_basic.phpt
+++ b/ext/dom/tests/DOMNode_removeChild_basic.phpt
@@ -39,7 +39,7 @@ $root = $dom->documentElement;
 
 $children = $root->childNodes;
 $len = $children->length;
-echo "orignal has $len nodes\n";
+echo "original has $len nodes\n";
 for ($index = $children->length - 1; $index >=0; $index--) {
 	echo "node $index\n";
 	$current = $children->item($index);
@@ -58,7 +58,7 @@ for ($index = 0; $index < $children->length; $index++) {
 }
 
 --EXPECTF--
-orignal has 5 nodes
+original has 5 nodes
 node 4
 Course: no title:DOMText
 ~string(1) "
diff --git a/ext/dom/tests/bug44648.phpt b/ext/dom/tests/bug44648.phpt
index d04f590ac..4ff7ac389 100644
--- a/ext/dom/tests/bug44648.phpt
+++ b/ext/dom/tests/bug44648.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #44648 (Attribute names not checked for wellformedness)
+Bug #44648 (Attribute names not checked for well formedness)
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
diff --git a/ext/dom/tests/empty.html b/ext/dom/tests/empty.html
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ext/dom/tests/empty.html
diff --git a/ext/dom/tests/not_well.html b/ext/dom/tests/not_well.html
new file mode 100644
index 000000000..151f46295
--- /dev/null
+++ b/ext/dom/tests/not_well.html
@@ -0,0 +1,8 @@
+<head>
+<title>Hello world</title>
+</head>
+<body>
+This is a not well-formed<br>
+html files with undeclared entities&nbsp;
+</body>
+</html>
diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
index cf556a350..d12ef3032 100644
--- a/ext/dom/xpath.c
+++ b/ext/dom/xpath.c
@@ -74,7 +74,7 @@ const zend_function_entry php_dom_xpath_class_functions[] = {
 
 static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int type) /* {{{ */
 {
-	zval **args;
+	zval **args = NULL;
 	zval *retval;
 	int result, i, ret;
 	int error = 0;
diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c
index e4b426376..98b5c9fd8 100644
--- a/ext/enchant/enchant.c
+++ b/ext/enchant/enchant.c
@@ -651,7 +651,7 @@ PHP_FUNCTION(enchant_broker_free_dict)
 /* }}} */
 
 /* {{{ proto bool enchant_broker_dict_exists(resource broker, string tag)
-   Wether a dictionary exists or not. Using non-empty tag */
+   Whether a dictionary exists or not. Using non-empty tag */
 PHP_FUNCTION(enchant_broker_dict_exists)
 {
 	zval *broker;
@@ -674,7 +674,7 @@ PHP_FUNCTION(enchant_broker_dict_exists)
 	described/referred to by 'tag'. The ordering is a comma delimited
 	list of provider names. As a special exception, the "*" tag can
 	be used as a language tag to declare a default ordering for any
-	language that does not explictly declare an ordering. */
+	language that does not explicitly declare an ordering. */
 
 PHP_FUNCTION(enchant_broker_set_ordering)
 {
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index c69107589..bd646d9ad 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -2595,7 +2595,7 @@ static int exif_process_string_raw(char **result, char *value, size_t byte_count
 
 /* {{{ exif_process_string
  * Copy a string in Exif header to a character string and return length of allocated buffer if any.
- * In contrast to exif_process_string this function does allways return a string buffer */
+ * In contrast to exif_process_string this function does always return a string buffer */
 static int exif_process_string(char **result, char *value, size_t byte_count TSRMLS_DC) {
 	/* we cannot use strlcpy - here the problem is that we cannot use strlen to
 	 * determin length of string and we cannot use strlcpy with len=byte_count+1
diff --git a/ext/exif/tests/exif_tagname_variation1.phpt b/ext/exif/tests/exif_tagname_variation1.phpt
index da899194c..0f9c13542 100644
--- a/ext/exif/tests/exif_tagname_variation1.phpt
+++ b/ext/exif/tests/exif_tagname_variation1.phpt
@@ -78,7 +78,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of exif_tagname()
-// when $index arugment is supplied with different values
+// when $index argument is supplied with different values
 
 echo "\n--- Testing exif_tagname() by supplying different values for 'index' argument ---\n";
 $counter = 1;
diff --git a/ext/fileinfo/libmagic.patch b/ext/fileinfo/libmagic.patch
index a35ff6745..97e771e92 100644
--- a/ext/fileinfo/libmagic.patch
+++ b/ext/fileinfo/libmagic.patch
@@ -1,6 +1,6 @@
 diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
 --- libmagic.orig/apprentice.c	2013-03-21 18:45:14.000000000 +0100
-+++ libmagic/apprentice.c	2013-04-08 16:14:17.828357711 +0200
++++ libmagic/apprentice.c	2013-04-27 13:53:32.175250261 +0200
 @@ -29,6 +29,8 @@
   * apprentice - make one pass through /etc/magic, learning its secrets.
   */
@@ -352,7 +352,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
  		file_oomem(ms, slen);
  		return -1;
  	}
-@@ -1102,14 +1121,14 @@
+@@ -1102,27 +1121,29 @@
  	if (me == NULL)
  		return;
  	for (i = 0; i < nme; i++)
@@ -370,8 +370,9 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
  	struct magic_entry *mentry[MAGIC_SETS] = { NULL };
  	uint32_t mentrycount[MAGIC_SETS] = { 0 };
  	uint32_t i, j;
-@@ -1117,12 +1136,14 @@
- 	char **filearr = NULL, *mfn;
+ 	size_t files = 0, maxfiles = 0;
+-	char **filearr = NULL, *mfn;
++	char **filearr = NULL;
  	struct stat st;
  	struct magic_map *map;
 -	DIR *dir;
@@ -411,7 +412,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
 +		int mflen;
 +		char mfn[MAXPATHLEN];
 +
-+		dir = php_stream_opendir(fn, REPORT_ERRORS, NULL);
++		dir = php_stream_opendir((char *)fn, REPORT_ERRORS, NULL);
  		if (!dir) {
  			errs++;
  			goto out;
@@ -578,7 +579,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
 +#ifdef PHP_WIN32
 +	/* Don't bother on windows with php_stream_open_wrapper,
 +	return to give apprentice_load() a chance. */
-+	if (php_stream_stat_path_ex(fn, 0, &st, NULL) == SUCCESS) {
++	if (php_stream_stat_path_ex((char *)fn, 0, &st, NULL) == SUCCESS) {
 +               if (st.sb.st_mode & S_IFDIR) {
 +                       goto error;
 +               }
@@ -751,7 +752,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
  	}
  
 -	if (write(fd, map->nmagic, nm) != (ssize_t)nm) {
-+	if (php_stream_write(stream, map->nmagic, nm) != (ssize_t)nm) {
++	if (php_stream_write(stream, (const char *)map->nmagic, nm) != (ssize_t)nm) {
  		file_error(ms, errno, "error writing `%s'", dbname);
  		goto out;
  	}
@@ -767,7 +768,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
  	for (i = 0; i < MAGIC_SETS; i++) {
  		len = m * map->nmagic[i];
 -		if (write(fd, map->magic[i], len) != (ssize_t)len) {
-+		if (php_stream_write(stream, map->magic[i], len) != (ssize_t)len) {
++		if (php_stream_write(stream, (const char *)map->magic[i], len) != (ssize_t)len) {
  			file_error(ms, errno, "error writing `%s'", dbname);
  			goto out;
  		}
@@ -2047,7 +2048,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c
 +
 diff -u libmagic.orig/magic.c libmagic/magic.c
 --- libmagic.orig/magic.c	2013-01-11 17:43:09.000000000 +0100
-+++ libmagic/magic.c	2013-04-08 15:42:57.328298809 +0200
++++ libmagic/magic.c	2013-04-27 13:53:32.175250261 +0200
 @@ -25,11 +25,6 @@
   * SUCH DAMAGE.
   */
@@ -2089,7 +2090,7 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
  #if defined(HAVE_UTIMES)
  # include <sys/time.h>
  #elif defined(HAVE_UTIME)
-@@ -71,18 +75,24 @@
+@@ -71,18 +75,25 @@
  #endif
  #endif
  
@@ -2098,14 +2099,14 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
 +# undef S_IFIFO
 +#endif
 +
-+private void free_mlist(struct mlist *);
  private void close_and_restore(const struct magic_set *, const char *, int,
      const struct stat *);
  private int unreadable_info(struct magic_set *, mode_t, const char *);
++#if 0
  private const char* get_default_magic(void);
 -#ifndef COMPILE_ONLY
 -private const char *file_or_fd(struct magic_set *, const char *, int);
--#endif
+ #endif
 +private const char *file_or_stream(struct magic_set *, const char *, php_stream *);
  
  #ifndef	STDIN_FILENO
@@ -2117,7 +2118,7 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
  private const char *
  get_default_magic(void)
  {
-@@ -90,7 +100,7 @@
+@@ -90,7 +101,7 @@
  	static char *default_magic;
  	char *home, *hmagicpath;
  
@@ -2126,7 +2127,7 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
  	struct stat st;
  
  	if (default_magic) {
-@@ -104,17 +114,17 @@
+@@ -104,17 +115,17 @@
  		return MAGIC;
  	if (stat(hmagicpath, &st) == -1) {
  		free(hmagicpath);
@@ -2153,7 +2154,7 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
  	}
  
  	if (asprintf(&default_magic, "%s:%s", hmagicpath, MAGIC) < 0)
-@@ -128,6 +138,7 @@
+@@ -128,6 +139,7 @@
  #else
  	char *hmagicp = hmagicpath;
  	char *tmppath = NULL;
@@ -2161,7 +2162,7 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
  
  #define APPENDPATH() \
  	do { \
-@@ -172,7 +183,7 @@
+@@ -172,7 +184,7 @@
  	}
  
  	/* Third, try to get magic file relative to dll location */
@@ -2170,7 +2171,7 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
  	dllpath[MAX_PATH] = 0;	/* just in case long path gets truncated and not null terminated */
  	if (GetModuleFileNameA(NULL, dllpath, MAX_PATH)){
  		PathRemoveFileSpecA(dllpath);
-@@ -210,6 +221,7 @@
+@@ -210,6 +222,7 @@
  
  	return action == FILE_LOAD ? get_default_magic() : MAGIC;
  }
@@ -2178,7 +2179,7 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
  
  public struct magic_set *
  magic_open(int flags)
-@@ -250,7 +262,7 @@
+@@ -250,7 +263,7 @@
  magic_load(struct magic_set *ms, const char *magicfile)
  {
  	if (ms == NULL)
@@ -2187,7 +2188,7 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
  	return file_apprentice(ms, magicfile, FILE_LOAD);
  }
  
-@@ -262,13 +274,6 @@
+@@ -262,13 +275,6 @@
  	return file_apprentice(ms, magicfile, FILE_COMPILE);
  }
  
@@ -2201,7 +2202,7 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
  
  public int
  magic_list(struct magic_set *ms, const char *magicfile)
-@@ -282,9 +287,6 @@
+@@ -282,9 +288,6 @@
  close_and_restore(const struct magic_set *ms, const char *name, int fd,
      const struct stat *sb)
  {
@@ -2211,7 +2212,7 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
  
  	if ((ms->flags & MAGIC_PRESERVE_ATIME) != 0) {
  		/*
-@@ -311,7 +313,6 @@
+@@ -311,7 +314,6 @@
  	}
  }
  
@@ -2219,7 +2220,7 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
  
  /*
   * find type of descriptor
-@@ -321,7 +322,7 @@
+@@ -321,7 +323,7 @@
  {
  	if (ms == NULL)
  		return NULL;
@@ -2228,7 +2229,7 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
  }
  
  /*
-@@ -332,30 +333,42 @@
+@@ -332,30 +334,42 @@
  {
  	if (ms == NULL)
  		return NULL;
@@ -2277,7 +2278,7 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
  	case -1:		/* error */
  		goto done;
  	case 0:			/* nothing found */
-@@ -365,68 +378,48 @@
+@@ -365,68 +379,48 @@
  		goto done;
  	}
  
@@ -2372,7 +2373,7 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
  	return rv == 0 ? file_getbuffer(ms) : NULL;
  }
  
-@@ -440,14 +433,13 @@
+@@ -440,14 +434,13 @@
  		return NULL;
  	/*
  	 * The main work is done here!
@@ -2410,8 +2411,8 @@ diff -u libmagic.orig/magic.h libmagic/magic.h
  
 diff -u libmagic.orig/print.c libmagic/print.c
 --- libmagic.orig/print.c	2013-03-21 18:45:14.000000000 +0100
-+++ libmagic/print.c	2013-04-08 15:42:57.328298809 +0200
-@@ -28,6 +28,8 @@
++++ libmagic/print.c	2013-04-27 13:53:32.175250261 +0200
+@@ -28,13 +28,17 @@
  /*
   * print.c - debugging printout routines
   */
@@ -2419,8 +2420,9 @@ diff -u libmagic.orig/print.c libmagic/print.c
 +#include "php.h"
  
  #include "file.h"
++#include "cdf.h"
  
-@@ -35,6 +37,7 @@
+ #ifndef lint
  FILE_RCSID("@(#)$File: print.c,v 1.76 2013/02/26 18:25:00 christos Exp $")
  #endif  /* lint */
  
@@ -2428,7 +2430,7 @@ diff -u libmagic.orig/print.c libmagic/print.c
  #include <string.h>
  #include <stdarg.h>
  #include <stdlib.h>
-@@ -43,188 +46,28 @@
+@@ -43,188 +47,28 @@
  #endif
  #include <time.h>
  
@@ -2619,7 +2621,7 @@ diff -u libmagic.orig/print.c libmagic/print.c
 -	(void) fprintf(stderr, "Warning: ");
  	va_start(va, f);
 -	(void) vfprintf(stderr, f, va);
-+	vasprintf(&expanded_format, f, va);
++	if (vasprintf(&expanded_format, f, va)); /* silence */
  	va_end(va);
 -	(void) fputc('\n', stderr);
 +	
@@ -2629,7 +2631,7 @@ diff -u libmagic.orig/print.c libmagic/print.c
  }
  
  protected const char *
-@@ -235,7 +78,7 @@
+@@ -235,7 +79,7 @@
  	struct tm *tm;
  
  	if (flags & FILE_T_WINDOWS) {
@@ -2976,7 +2978,7 @@ diff -u libmagic.orig/readelf.h libmagic/readelf.h
  typedef uint8_t		Elf64_Char;
 diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
 --- libmagic.orig/softmagic.c	2013-03-21 18:45:14.000000000 +0100
-+++ libmagic/softmagic.c	2013-04-08 15:42:57.328298809 +0200
++++ libmagic/softmagic.c	2013-05-14 11:00:07.044745939 +0200
 @@ -41,6 +41,11 @@
  #include <stdlib.h>
  #include <time.h>
@@ -3121,7 +3123,7 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
  		}
  	}
  
-@@ -1717,9 +1694,9 @@
+@@ -1717,12 +1694,12 @@
  		ms->o.buf = sbuf;
  		ms->offset = soffset;
  		if (rv == 1) {
@@ -3132,7 +3134,11 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
 +			return -1;
  			if (file_printf(ms, "%s", rbuf) == -1)
  				return -1;
- 			free(rbuf);
+-			free(rbuf);
++			efree(rbuf);
+ 		}
+ 		return rv;
+ 
 @@ -1837,6 +1814,42 @@
  	return file_strncmp(a, b, len, flags);
  }
diff --git a/ext/fileinfo/libmagic/apprentice.c b/ext/fileinfo/libmagic/apprentice.c
index 8ae572973..11920e658 100644
--- a/ext/fileinfo/libmagic/apprentice.c
+++ b/ext/fileinfo/libmagic/apprentice.c
@@ -1133,7 +1133,7 @@ apprentice_load(struct magic_set *ms, const char *fn, int action)
 	uint32_t mentrycount[MAGIC_SETS] = { 0 };
 	uint32_t i, j;
 	size_t files = 0, maxfiles = 0;
-	char **filearr = NULL, *mfn;
+	char **filearr = NULL;
 	struct stat st;
 	struct magic_map *map;
 	php_stream *dir;
@@ -1169,7 +1169,7 @@ apprentice_load(struct magic_set *ms, const char *fn, int action)
 		int mflen;
 		char mfn[MAXPATHLEN];
 
-		dir = php_stream_opendir(fn, REPORT_ERRORS, NULL);
+		dir = php_stream_opendir((char *)fn, REPORT_ERRORS, NULL);
 		if (!dir) {
 			errs++;
 			goto out;
@@ -2613,7 +2613,7 @@ apprentice_map(struct magic_set *ms, const char *fn)
 #ifdef PHP_WIN32
 	/* Don't bother on windows with php_stream_open_wrapper,
 	return to give apprentice_load() a chance. */
-	if (php_stream_stat_path_ex(fn, 0, &st, NULL) == SUCCESS) {
+	if (php_stream_stat_path_ex((char *)fn, 0, &st, NULL) == SUCCESS) {
                if (st.sb.st_mode & S_IFDIR) {
                        goto error;
                }
@@ -2778,7 +2778,7 @@ apprentice_compile(struct magic_set *ms, struct magic_map *map, const char *fn)
 		goto out;
 	}
 
-	if (php_stream_write(stream, map->nmagic, nm) != (ssize_t)nm) {
+	if (php_stream_write(stream, (const char *)map->nmagic, nm) != (ssize_t)nm) {
 		file_error(ms, errno, "error writing `%s'", dbname);
 		goto out;
 	}
@@ -2792,7 +2792,7 @@ apprentice_compile(struct magic_set *ms, struct magic_map *map, const char *fn)
 
 	for (i = 0; i < MAGIC_SETS; i++) {
 		len = m * map->nmagic[i];
-		if (php_stream_write(stream, map->magic[i], len) != (ssize_t)len) {
+		if (php_stream_write(stream, (const char *)map->magic[i], len) != (ssize_t)len) {
 			file_error(ms, errno, "error writing `%s'", dbname);
 			goto out;
 		}
diff --git a/ext/fileinfo/libmagic/magic.c b/ext/fileinfo/libmagic/magic.c
index 15fd6be77..4bcc49eb8 100644
--- a/ext/fileinfo/libmagic/magic.c
+++ b/ext/fileinfo/libmagic/magic.c
@@ -80,11 +80,12 @@ FILE_RCSID("@(#)$File: magic.c,v 1.78 2013/01/07 18:20:19 christos Exp $")
 # undef S_IFIFO
 #endif
 
-private void free_mlist(struct mlist *);
 private void close_and_restore(const struct magic_set *, const char *, int,
     const struct stat *);
 private int unreadable_info(struct magic_set *, mode_t, const char *);
+#if 0
 private const char* get_default_magic(void);
+#endif
 private const char *file_or_stream(struct magic_set *, const char *, php_stream *);
 
 #ifndef	STDIN_FILENO
diff --git a/ext/fileinfo/libmagic/print.c b/ext/fileinfo/libmagic/print.c
index fff258b7e..63e34bee0 100644
--- a/ext/fileinfo/libmagic/print.c
+++ b/ext/fileinfo/libmagic/print.c
@@ -33,6 +33,7 @@
 #include "php.h"
 
 #include "file.h"
+#include "cdf.h"
 
 #ifndef lint
 FILE_RCSID("@(#)$File: print.c,v 1.76 2013/02/26 18:25:00 christos Exp $")
@@ -63,7 +64,7 @@ file_magwarn(struct magic_set *ms, const char *f, ...)
 	TSRMLS_FETCH();
 
 	va_start(va, f);
-	vasprintf(&expanded_format, f, va);
+	if (vasprintf(&expanded_format, f, va)); /* silence */
 	va_end(va);
 	
 	php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Warning: %s", expanded_format);
diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c
index c69fdb5a3..0671fa99f 100644
--- a/ext/fileinfo/libmagic/softmagic.c
+++ b/ext/fileinfo/libmagic/softmagic.c
@@ -1630,7 +1630,7 @@ mget(struct magic_set *ms, const unsigned char *s, struct magic *m,
 	/* Verify we have enough data to match magic type */
 	switch (m->type) {
 	case FILE_BYTE:
-		if (nbytes < (offset + 1)) /* should alway be true */
+		if (nbytes < (offset + 1)) /* should always be true */
 			return 0;
 		break;
 
@@ -1699,7 +1699,7 @@ mget(struct magic_set *ms, const unsigned char *s, struct magic *m,
 			return -1;
 			if (file_printf(ms, "%s", rbuf) == -1)
 				return -1;
-			free(rbuf);
+			efree(rbuf);
 		}
 		return rv;
 
diff --git a/ext/fileinfo/tests/finfo_file_002.phpt b/ext/fileinfo/tests/finfo_file_002.phpt
index 3593233c3..feb4010f7 100644
--- a/ext/fileinfo/tests/finfo_file_002.phpt
+++ b/ext/fileinfo/tests/finfo_file_002.phpt
@@ -18,7 +18,7 @@ ksort($results);
 var_dump($results);
 ?>
 --EXPECTF--
-array(7) {
+array(8) {
   ["%s/resources/dir.zip"]=>
   string(15) "application/zip"
   ["%s/resources/test.awk"]=>
@@ -29,6 +29,8 @@ array(7) {
   string(9) "image/gif"
   ["%s/resources/test.jpg"]=>
   string(10) "image/jpeg"
+  ["%s/resources/test.mp3"]=>
+  string(10) "audio/mpeg"
   ["%s/resources/test.pdf"]=>
   string(15) "application/pdf"
   ["%s/resources/test.png"]=>
diff --git a/ext/fileinfo/tests/finfo_phpinfo_basic.phpt b/ext/fileinfo/tests/finfo_phpinfo_basic.phpt
index c43ba4e29..7d1b008d5 100644
--- a/ext/fileinfo/tests/finfo_phpinfo_basic.phpt
+++ b/ext/fileinfo/tests/finfo_phpinfo_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test finfo extention : loading into phpinfo()
+Test finfo extension : loading into phpinfo()
 --SKIPIF--
 <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
 --FILE--
diff --git a/ext/fileinfo/tests/magic b/ext/fileinfo/tests/magic
index 5266dd0dc..aa75fb65b 100644
--- a/ext/fileinfo/tests/magic
+++ b/ext/fileinfo/tests/magic
@@ -3303,7 +3303,7 @@
 >>>0x44		string	=GLOB		\b.
 >>>>0x60	beshort	x		\b%.4d
 
-# Scripts that run in the embeded Python interpreter
+# Scripts that run in the embedded Python interpreter
 0		string	#!BPY		Blender3D BPython script
 
 #------------------------------------------------------------------------------
@@ -4957,7 +4957,7 @@
 >>>>0	ubelong			=0		\b, next free block index %lu
 >>>>0	ubelong			!0		\b, next free block index %lu
 >>>512	default			x		dBase IV DBT
-# DBF file name without extention 
+# DBF file name without extension 
 >>>>8	string			>\0		\b of %-.8s.DBF
 # size of blocks  ; not reliable 0x2020204C
 #>>>>4	ulelong			=0		\b, blocks size %lu
@@ -11969,7 +11969,7 @@
 #>65	string		ZSYS		(Pre-System 7 system file)
 #>65	string		acf3		(Aldus FreeHand)
 #>65	string		cdev		(control panel)
-#>65	string		dfil		(Desk Acessory suitcase)
+#>65	string		dfil		(Desk Accessory suitcase)
 #>65	string		libr		(library)
 #>65	string		nX^d		(WriteNow word processor)
 #>65	string		nX^w		(WriteNow dictionary)
@@ -13205,7 +13205,7 @@
 # they have their real name at offset 22
 >>>>>22		string			>\0			\b%-.5s
 >4	uleshort&0x8000			0x0000			
-# 32 bit sector adressing ( > 32 MB) for block devices
+# 32 bit sector addressing ( > 32 MB) for block devices
 >>4	uleshort&0x0002			0x0002			\b,32-bit sector-
 # support by driver functions 13h, 17h, 18h
 >4	uleshort&0x0040			0x0040			\b,IOCTL-
@@ -17951,7 +17951,7 @@
 #   00030  00 00 00 00 01 00 00 00  00 00 00 00 00 00 00 00  ................
 #   00040  00 00 00 00 ff ff ff ff  ff ff ff ff 02 00 00 00  ................
 #
-# GRR this test is still too general as it catches example adressen.dbt
+# GRR this test is still too general as it catches example addressen.dbt
 0	belong	0x03000000	
 >8	ubelong	0xec020000	VMS Alpha executable
 >>75264	string	PK\003\004	\b, Info-ZIP SFX archive v5.12 w/decryption
diff --git a/ext/fileinfo/tests/resources/test.mp3 b/ext/fileinfo/tests/resources/test.mp3
new file mode 100644
index 000000000..ff6dc3ad7
--- /dev/null
+++ b/ext/fileinfo/tests/resources/test.mp3
diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 2aa8dd57d..6496ccdb6 100644
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -241,7 +241,7 @@ PHP_MINIT_FUNCTION(filter)
 	REGISTER_LONG_CONSTANT("FILTER_SANITIZE_STRIPPED", FILTER_SANITIZE_STRING, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("FILTER_SANITIZE_ENCODED", FILTER_SANITIZE_ENCODED, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("FILTER_SANITIZE_SPECIAL_CHARS", FILTER_SANITIZE_SPECIAL_CHARS, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("FILTER_SANITIZE_FULL_SPECIAL_CHARS", FILTER_SANITIZE_SPECIAL_CHARS, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("FILTER_SANITIZE_FULL_SPECIAL_CHARS", FILTER_SANITIZE_FULL_SPECIAL_CHARS, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("FILTER_SANITIZE_EMAIL", FILTER_SANITIZE_EMAIL, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("FILTER_SANITIZE_URL", FILTER_SANITIZE_URL, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("FILTER_SANITIZE_NUMBER_INT", FILTER_SANITIZE_NUMBER_INT, CONST_CS | CONST_PERSISTENT);
diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
index 58d5870c1..14964883c 100644
--- a/ext/filter/logical_filters.c
+++ b/ext/filter/logical_filters.c
@@ -484,10 +484,6 @@ void php_filter_validate_url(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 			}
 			s++;
 		}
-
-		if (*(e - 1) == '.') {
-			goto bad_url;
-		}
 	}
 
 	if (
@@ -718,6 +714,7 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 			if (flags & FILTER_FLAG_NO_RES_RANGE) {
 				if (
 					(ip[0] == 0) ||
+					(ip[0] == 100 && (ip[1] >= 64 || ip[1] <= 127)) ||
 					(ip[0] == 128 && ip[1] == 0) ||
 					(ip[0] == 191 && ip[1] == 255) ||
 					(ip[0] == 169 && ip[1] == 254) ||
diff --git a/ext/filter/tests/018.phpt b/ext/filter/tests/018.phpt
index af52b2e60..9c73fc3cf 100644
--- a/ext/filter/tests/018.phpt
+++ b/ext/filter/tests/018.phpt
@@ -15,6 +15,8 @@ var_dump(filter_var("192.168.0.1", FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE
 var_dump(filter_var("192.0.34.166", FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE));
 var_dump(filter_var("127.0.0.1", FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE));
 var_dump(filter_var("192.0.0.1", FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE));
+var_dump(filter_var("100.0.0.0", FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE));
+var_dump(filter_var("100.127.255.255", FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE));
 var_dump(filter_var("192.0.34.166", FILTER_VALIDATE_IP));
 var_dump(filter_var("256.1237.123.1", FILTER_VALIDATE_IP));
 var_dump(filter_var("255.255.255.255", FILTER_VALIDATE_IP));
@@ -40,6 +42,8 @@ bool(false)
 string(12) "192.0.34.166"
 bool(false)
 string(9) "192.0.0.1"
+bool(false)
+bool(false)
 string(12) "192.0.34.166"
 bool(false)
 string(15) "255.255.255.255"
diff --git a/ext/filter/tests/bug49510.phpt b/ext/filter/tests/bug49510.phpt
index 3f365cc43..340c1ccd6 100644
--- a/ext/filter/tests/bug49510.phpt
+++ b/ext/filter/tests/bug49510.phpt
@@ -1,5 +1,7 @@
 --TEST--
-#49510	boolean validation fails with FILTER_NULL_ON_FAILURE
+Bug #49510	boolean validation fails with FILTER_NULL_ON_FAILURE
+--SKIPIF--
+<?php if (!extension_loaded("filter")) die("skip"); ?>
 --FILE--
 <?php
 var_dump(filter_var(false, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE));
diff --git a/ext/filter/tests/bug64441.phpt b/ext/filter/tests/bug64441.phpt
new file mode 100644
index 000000000..149079ec0
--- /dev/null
+++ b/ext/filter/tests/bug64441.phpt
@@ -0,0 +1,11 @@
+--TEST--
+bug 64441, FILTER_VALIDATE_URL will invalidate a hostname that ended by dot
+--SKIPIF--
+<?php if (!extension_loaded("filter")) die("skip"); ?>
+--FILE--
+<?php
+var_dump(filter_var('http://example.com./', FILTER_VALIDATE_URL));
+var_dump(filter_var('http://example.com/', FILTER_VALIDATE_URL));
+--EXPECT--
+string(20) "http://example.com./"
+string(19) "http://example.com/"
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
index 4c8a94f81..0d6704f9d 100644
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@ -39,7 +39,7 @@
 #ifdef PHP_WIN32
 #include <winsock2.h>
 #elif defined(NETWARE)
-#ifdef USE_WINSOCK    /* Modified to use Winsock (NOVSOCK2.H), atleast for now */
+#ifdef USE_WINSOCK    /* Modified to use Winsock (NOVSOCK2.H), at least for now */
 #include <novsock2.h>
 #else
 #include <sys/socket.h>
@@ -182,6 +182,7 @@ ftp_close(ftpbuf_t *ftp)
 #if HAVE_OPENSSL_EXT
 		if (ftp->ssl_active) {
 			SSL_shutdown(ftp->ssl_handle);
+			SSL_free(ftp->ssl_handle);
 		}
 #endif		
 		closesocket(ftp->fd);
@@ -297,6 +298,7 @@ ftp_login(ftpbuf_t *ftp, const char *user, const char *pass TSRMLS_DC)
 		if (SSL_connect(ftp->ssl_handle) <= 0) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSL/TLS handshake failed");
 			SSL_shutdown(ftp->ssl_handle);
+			SSL_free(ftp->ssl_handle);
 			return 0;
 		}
 
@@ -610,7 +612,7 @@ ftp_chmod(ftpbuf_t *ftp, const int mode, const char *filename, const int filenam
 /* {{{ ftp_alloc
  */
 int
-ftp_alloc(ftpbuf_t *ftp, const int size, char **response)
+ftp_alloc(ftpbuf_t *ftp, const long size, char **response)
 {
 	char buffer[64];
 
@@ -618,8 +620,8 @@ ftp_alloc(ftpbuf_t *ftp, const int size, char **response)
 		return 0;
 	}
 
-	snprintf(buffer, sizeof(buffer) - 1, "%d", size);
-
+	snprintf(buffer, sizeof(buffer) - 1, "%ld", size);
+    
 	if (!ftp_putcmd(ftp, "ALLO", buffer)) {
 		return 0;
 	}
@@ -785,7 +787,7 @@ ftp_pasv(ftpbuf_t *ftp, int pasv)
 /* {{{ ftp_get
  */
 int
-ftp_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, ftptype_t type, int resumepos TSRMLS_DC)
+ftp_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, ftptype_t type, long resumepos TSRMLS_DC)
 {
 	databuf_t		*data = NULL;
 	int			lastch;
@@ -806,11 +808,7 @@ ftp_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, ftptype_t type,
 	ftp->data = data;
 
 	if (resumepos > 0) {
-		if (resumepos > 2147483647) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot handle files greater than 2147483647 bytes.");
-			goto bail;
-		}
-		snprintf(arg, sizeof(arg), "%u", resumepos);
+		snprintf(arg, sizeof(arg), "%ld", resumepos);
 		if (!ftp_putcmd(ftp, "REST", arg)) {
 			goto bail;
 		}
@@ -883,10 +881,10 @@ bail:
 /* {{{ ftp_put
  */
 int
-ftp_put(ftpbuf_t *ftp, const char *path, php_stream *instream, ftptype_t type, int startpos TSRMLS_DC)
+ftp_put(ftpbuf_t *ftp, const char *path, php_stream *instream, ftptype_t type, long startpos TSRMLS_DC)
 {
 	databuf_t		*data = NULL;
-	int			size;
+	long			size;
 	char			*ptr;
 	int			ch;
 	char			arg[11];
@@ -903,11 +901,7 @@ ftp_put(ftpbuf_t *ftp, const char *path, php_stream *instream, ftptype_t type, i
 	ftp->data = data;	
 
 	if (startpos > 0) {
-		if (startpos > 2147483647) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot handle files with a size greater than 2147483647 bytes.");
-			goto bail;
-		}
-		snprintf(arg, sizeof(arg), "%u", startpos);
+		snprintf(arg, sizeof(arg), "%ld", startpos);
 		if (!ftp_putcmd(ftp, "REST", arg)) {
 			goto bail;
 		}
@@ -964,7 +958,7 @@ bail:
 
 /* {{{ ftp_size
  */
-int
+long
 ftp_size(ftpbuf_t *ftp, const char *path)
 {
 	if (ftp == NULL) {
@@ -979,7 +973,7 @@ ftp_size(ftpbuf_t *ftp, const char *path)
 	if (!ftp_getresp(ftp) || ftp->resp != 213) {
 		return -1;
 	}
-	return atoi(ftp->inbuf);
+	return atol(ftp->inbuf);
 }
 /* }}} */
 
@@ -1141,7 +1135,7 @@ ftp_putcmd(ftpbuf_t *ftp, const char *cmd, const char *args)
 int
 ftp_readline(ftpbuf_t *ftp)
 {
-	int		size, rcvd;
+	long		size, rcvd;
 	char		*data, *eol;
 
 	/* shift the extra to the front */
@@ -1234,7 +1228,8 @@ ftp_getresp(ftpbuf_t *ftp)
 int
 my_send(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len)
 {
-	int		n, size, sent;
+	long		size, sent;
+    int         n;
 
 	size = len;
 	while (size) {
@@ -1548,6 +1543,7 @@ data_accepted:
 		if (SSL_connect(data->ssl_handle) <= 0) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "data_accept: SSL/TLS handshake failed");
 			SSL_shutdown(data->ssl_handle);
+			SSL_free(data->ssl_handle);
 			return 0;
 		}
 			
@@ -1565,13 +1561,21 @@ data_accepted:
 databuf_t*
 data_close(ftpbuf_t *ftp, databuf_t *data)
 {
+#if HAVE_OPENSSL_EXT
+	SSL_CTX		*ctx;
+#endif				
 	if (data == NULL) {
 		return NULL;
 	}
 	if (data->listener != -1) {
 #if HAVE_OPENSSL_EXT
 		if (data->ssl_active) {
+		
+			ctx = SSL_get_SSL_CTX(data->ssl_handle);
+			SSL_CTX_free(ctx);
+
 			SSL_shutdown(data->ssl_handle);
+			SSL_free(data->ssl_handle);
 			data->ssl_active = 0;
 		}
 #endif				
@@ -1580,7 +1584,11 @@ data_close(ftpbuf_t *ftp, databuf_t *data)
 	if (data->fd != -1) {
 #if HAVE_OPENSSL_EXT
 		if (data->ssl_active) {
+			ctx = SSL_get_SSL_CTX(data->ssl_handle);
+			SSL_CTX_free(ctx);
+
 			SSL_shutdown(data->ssl_handle);
+			SSL_free(data->ssl_handle);
 			data->ssl_active = 0;
 		}
 #endif				
@@ -1704,7 +1712,7 @@ bail:
 /* {{{ ftp_nb_get
  */
 int
-ftp_nb_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, ftptype_t type, int resumepos TSRMLS_DC)
+ftp_nb_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, ftptype_t type, long resumepos TSRMLS_DC)
 {
 	databuf_t		*data = NULL;
 	char			arg[11];
@@ -1722,14 +1730,7 @@ ftp_nb_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, ftptype_t typ
 	}
 
 	if (resumepos>0) {
-		/* We are working on an architecture that supports 64-bit integers
-		 * since php is 32 bit by design, we bail out with warning
-		 */
-		if (resumepos > 2147483647) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot handle files greater than 2147483648 bytes.");
-			goto bail;
-		}
-		snprintf(arg, sizeof(arg), "%u", resumepos);
+		snprintf(arg, sizeof(arg), "%ld", resumepos);
 		if (!ftp_putcmd(ftp, "REST", arg)) {
 			goto bail;
 		}
@@ -1828,7 +1829,7 @@ bail:
 /* {{{ ftp_nb_put
  */
 int
-ftp_nb_put(ftpbuf_t *ftp, const char *path, php_stream *instream, ftptype_t type, int startpos TSRMLS_DC)
+ftp_nb_put(ftpbuf_t *ftp, const char *path, php_stream *instream, ftptype_t type, long startpos TSRMLS_DC)
 {
 	databuf_t		*data = NULL;
 	char			arg[11];
@@ -1843,11 +1844,7 @@ ftp_nb_put(ftpbuf_t *ftp, const char *path, php_stream *instream, ftptype_t type
 		goto bail;
 	}
 	if (startpos > 0) {
-		if (startpos > 2147483647) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot handle files with a size greater than 2147483647 bytes.");
-			goto bail;
-		}
-		snprintf(arg, sizeof(arg), "%u", startpos);
+		snprintf(arg, sizeof(arg), "%ld", startpos);
 		if (!ftp_putcmd(ftp, "REST", arg)) {
 			goto bail;
 		}
@@ -1884,7 +1881,7 @@ bail:
 int
 ftp_nb_continue_write(ftpbuf_t *ftp TSRMLS_DC)
 {
-	int			size;
+	long			size;
 	char			*ptr;
 	int 			ch;
 
diff --git a/ext/ftp/ftp.h b/ext/ftp/ftp.h
index c7db45789..69de7dbb7 100644
--- a/ext/ftp/ftp.h
+++ b/ext/ftp/ftp.h
@@ -146,7 +146,7 @@ int		ftp_chmod(ftpbuf_t *ftp, const int mode, const char *filename, const int fi
  * however some servers will not accept STOR or APPE until ALLO is confirmed. 
  * If response is passed, it is estrdup()ed from ftp->inbuf and must be freed
  * or assigned to a zval returned to the user */
-int		ftp_alloc(ftpbuf_t *ftp, const int size, char **response);
+int		ftp_alloc(ftpbuf_t *ftp, const long size, char **response);
 
 /* returns a NULL-terminated array of filenames in the given path
  * or NULL on error.  the return array must be freed (but don't
@@ -169,15 +169,15 @@ int		ftp_pasv(ftpbuf_t *ftp, int pasv);
 /* retrieves a file and saves its contents to outfp
  * returns true on success, false on error
  */
-int		ftp_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, ftptype_t type, int resumepos TSRMLS_DC);
+int		ftp_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, ftptype_t type, long resumepos TSRMLS_DC);
 
 /* stores the data from a file, socket, or process as a file on the remote server
  * returns true on success, false on error
  */
-int		ftp_put(ftpbuf_t *ftp, const char *path, php_stream *instream, ftptype_t type, int startpos TSRMLS_DC);
+int		ftp_put(ftpbuf_t *ftp, const char *path, php_stream *instream, ftptype_t type, long startpos TSRMLS_DC);
 
 /* returns the size of the given file, or -1 on error */
-int		ftp_size(ftpbuf_t *ftp, const char *path);
+long		ftp_size(ftpbuf_t *ftp, const char *path);
 
 /* returns the last modified time of the given file, or -1 on error */
 time_t		ftp_mdtm(ftpbuf_t *ftp, const char *path);
@@ -194,12 +194,12 @@ int		ftp_site(ftpbuf_t *ftp, const char *cmd);
 /* retrieves part of a file and saves its contents to outfp
  * returns true on success, false on error
  */
-int		ftp_nb_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, ftptype_t type, int resumepos TSRMLS_DC);
+int		ftp_nb_get(ftpbuf_t *ftp, php_stream *outstream, const char *path, ftptype_t type, long resumepos TSRMLS_DC);
 
 /* stores the data from a file, socket, or process as a file on the remote server
  * returns true on success, false on error
  */
-int		ftp_nb_put(ftpbuf_t *ftp, const char *path, php_stream *instream, ftptype_t type, int startpos TSRMLS_DC);
+int		ftp_nb_put(ftpbuf_t *ftp, const char *path, php_stream *instream, ftptype_t type, long startpos TSRMLS_DC);
 
 /* continues a previous nb_(f)get command
  */
diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
index 73071936e..da22e0b63 100644
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@@ -784,8 +784,8 @@ PHP_FUNCTION(ftp_nb_fget)
 	ftptype_t	xtype;
 	php_stream	*stream;
 	char		*file;
-	int		file_len, ret;
-	long		mode, resumepos=0;
+	int		file_len;
+	long		mode, resumepos=0, ret;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrsl|l", &z_ftp, &z_file, &file, &file_len, &mode, &resumepos) == FAILURE) {
 		return;
@@ -968,9 +968,7 @@ PHP_FUNCTION(ftp_nb_get)
 		RETURN_LONG(PHP_FTP_FAILED);
 	}
 
-	if (ret == PHP_FTP_FINISHED) {
-		php_stream_close(outstream);
-	}
+        php_stream_close(outstream);
 
 	RETURN_LONG(ret);
 }
@@ -982,7 +980,7 @@ PHP_FUNCTION(ftp_nb_continue)
 {
 	zval		*z_ftp;
 	ftpbuf_t	*ftp;
-	int		ret;
+	long		ret;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_ftp) == FAILURE) {
 		return;
@@ -1120,7 +1118,7 @@ PHP_FUNCTION(ftp_put)
 	ftpbuf_t	*ftp;
 	ftptype_t	xtype;
 	char		*remote, *local;
-	int		remote_len, local_len;
+	long		remote_len, local_len;
 	long		mode, startpos=0;
 	php_stream 	*instream;
 
@@ -1173,8 +1171,8 @@ PHP_FUNCTION(ftp_nb_put)
 	ftpbuf_t	*ftp;
 	ftptype_t	xtype;
 	char		*remote, *local;
-	int		remote_len, local_len, ret;
-	long		mode, startpos=0;
+	int		remote_len, local_len;
+	long		mode, startpos=0, ret;
 	php_stream 	*instream;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rppl|l", &z_ftp, &remote, &remote_len, &local, &local_len, &mode, &startpos) == FAILURE) {
diff --git a/ext/ftp/tests/filesize_large.phpt b/ext/ftp/tests/filesize_large.phpt
new file mode 100644
index 000000000..05f12a3e5
--- /dev/null
+++ b/ext/ftp/tests/filesize_large.phpt
@@ -0,0 +1,23 @@
+--TEST--
+Verify php can handle filesizes >32bit
+--SKIPIF--
+<?php
+require 'skipif.inc';
+if (2147483647 == PHP_INT_MAX) {
+    die('skip 64-bit only');
+}
+?>
+--FILE--
+<?php
+require 'server.inc';
+
+$ftp = ftp_connect('127.0.0.1', $port);
+if (!$ftp) die("Couldn't connect to the server");
+
+ftp_login($ftp, 'user', 'pass');
+var_dump(ftp_size($ftp, 'largefile'));
+
+ftp_close($ftp);
+?>
+--EXPECT--
+int(5368709120)
diff --git a/ext/ftp/tests/ftp_fget_basic.phpt b/ext/ftp/tests/ftp_fget_basic.phpt
index d736f8c45..355b8b846 100644
--- a/ext/ftp/tests/ftp_fget_basic.phpt
+++ b/ext/ftp/tests/ftp_fget_basic.phpt
@@ -27,7 +27,7 @@ var_dump(ftp_fget($ftp, $fp, 'binary data.bin', FTP_BINARY));
 fseek($fp, $postition);
 var_dump(urlencode(fgets($fp)));
 
-//test non-existant file request 
+//test non-existent file request 
 ftp_fget($ftp, $fp ,'a warning.txt', FTP_ASCII);
 
 //remove file
diff --git a/ext/ftp/tests/ftp_get_basic.phpt b/ext/ftp/tests/ftp_get_basic.phpt
index 23fd8d07f..2fd8c7914 100644
--- a/ext/ftp/tests/ftp_get_basic.phpt
+++ b/ext/ftp/tests/ftp_get_basic.phpt
@@ -27,7 +27,7 @@ var_dump(ftp_get($ftp, $tmpfname, 'binary data.bin', FTP_BINARY));
 var_dump(urlencode(file_get_contents($tmpfname)));
 unlink($tmpfname);
 
-//test non-existant file request 
+//test non-existent file request 
 ftp_get($ftp, $tmpfname ,'a warning.txt', FTP_ASCII);
 ?>
 --EXPECTF--
diff --git a/ext/ftp/tests/ftp_nb_get_large.phpt b/ext/ftp/tests/ftp_nb_get_large.phpt
new file mode 100644
index 000000000..3fbf2a483
--- /dev/null
+++ b/ext/ftp/tests/ftp_nb_get_large.phpt
@@ -0,0 +1,36 @@
+--TEST--
+Testing ftp_nb_fget can handle large files incl. resume
+--SKIPIF--
+<?php
+require 'skipif.inc';
+if (2147483647 == PHP_INT_MAX) {
+    die('skip ot supported on this system');
+}
+if (disk_free_space(__DIR__) < 10*1024*1024*1024) {
+    die('not enough disk space');
+}
+?>
+--FILE--
+<?php
+require 'server.inc';
+
+$ftp = ftp_connect('127.0.0.1', $port);
+ftp_login($ftp, 'user', 'pass');
+if (!$ftp) die("Couldn't connect to the server");
+
+$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt";
+touch($local_file);
+ftp_nb_get($ftp, $local_file, 'fget_large.txt', FTP_BINARY, 5368709119);
+$fp = fopen($local_file, 'r');
+fseek($fp, 5368709119);
+var_dump(fread($fp, 1));
+var_dump(filesize($local_file));
+fclose($fp);
+?>
+--CLEAN--
+<?php
+@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "localfile.txt");
+?>
+--EXPECT--
+string(1) "X"
+int(5368709120)
diff --git a/ext/ftp/tests/server.inc b/ext/ftp/tests/server.inc
index 861788062..7dc8fa08d 100644
--- a/ext/ftp/tests/server.inc
+++ b/ext/ftp/tests/server.inc
@@ -357,7 +357,17 @@ if ($pid) {
 					$transfer_type = $ascii? 'ASCII' : 'BINARY' ;
 					fputs($fs, "Bar\r\n");
 					fputs($s, "226 Closing data Connection.\r\n");
-					break;
+                                        break;
+                                case "fget_large":
+					fputs($s, "150 File status okay; about to open data connection.\r\n");
+                                        $transfer_type = $ascii? 'ASCII' : 'BINARY' ;
+                                        if ($GLOBALS['rest_pos'] == '5368709119') {
+					    fputs($fs, "X");
+                                        } else {
+					    fputs($fs, "Y");
+                                        }
+					fputs($s, "226 Closing data Connection.\r\n");
+                                        break;
 				default:
 					fputs($s, "550 {$matches[1]}: No such file or directory \r\n");
 					break;
@@ -393,11 +403,12 @@ if ($pid) {
 		}elseif (preg_match('/^LIST no_exists\//', $buf, $matches)) {
 			fputs($s, "425 Error establishing connection\r\n");
 
-		}elseif (preg_match('/^REST \d+/', $buf, $matches)) {
+                }elseif (preg_match('/^REST (\d+)/', $buf, $matches)) {
+                        $GLOBALS['rest_pos'] = $matches[1];
 			fputs($s, "350 OK\r\n");
-		}
-
-		else {
+                }elseif (preg_match('/^SIZE largefile/', $buf)) {
+                        fputs($s, "213 5368709120\r\n");
+                }else {
 			fputs($s, "500 Syntax error, command unrecognized.\r\n");
 			dump_and_exit($buf);
 		}
@@ -407,4 +418,4 @@ if ($pid) {
 }
 
 fclose($socket);
-?>
\ No newline at end of file
+?>
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 87e889345..3279463b7 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -129,7 +129,7 @@ int gdImageColorClosestHWB(gdImagePtr im, int r, int g, int b);
 /* IMPORTANT NOTE FOR NEW FILTER
  * Do not forget to update:
  * IMAGE_FILTER_MAX: define the last filter index
- * IMAGE_FILTER_MAX_ARGS: define the biggest amout of arguments
+ * IMAGE_FILTER_MAX_ARGS: define the biggest amount of arguments
  * image_filter array in PHP_FUNCTION(imagefilter)
  * */
 #define IMAGE_FILTER_NEGATE         0
diff --git a/ext/gd/libgd/webpimg.h b/ext/gd/libgd/webpimg.h
index 8a05429a7..db23de5bb 100644
--- a/ext/gd/libgd/webpimg.h
+++ b/ext/gd/libgd/webpimg.h
@@ -84,7 +84,7 @@ WebPResult WebPDecode(const uint8* data,
  *                               height.
  *      6. y_stride: The width (in bytes) of one row of Y data. This may not
  *                   match width if there is end of row padding (e.g., for 32
- *                   bit row aligment).
+ *                   bit row alignment).
  *      7. QP: the quantization parameter. This parameter controls the
  *             compression vs quality tradeoff. Use smaller numbers for better
  *             quality (compression will be lesser) and vice versa. 20 is a
diff --git a/ext/gd/tests/imagecopyresampled_basic.phpt b/ext/gd/tests/imagecopyresampled_basic.phpt
index a0454faf8..fd96ab692 100644
--- a/ext/gd/tests/imagecopyresampled_basic.phpt
+++ b/ext/gd/tests/imagecopyresampled_basic.phpt
@@ -35,9 +35,9 @@ imagefilledellipse($image_lge, 200, 150, 300, 200, $col_ellipse);
 imagepng($image_lge, $dest_lge);
 
 // Get new dimensions
-$percent = 0.5; // new image 50% of orginal
+$percent = 0.5; // new image 50% of original
 list($width, $height) = getimagesize($dest_lge);
-echo "Size of orginal: width=". $width . " height=" . $height . "\n";
+echo "Size of original: width=". $width . " height=" . $height . "\n";
 
 $new_width = $width * $percent;
 $new_height = $height * $percent;
@@ -66,6 +66,6 @@ echo "Done\n";
 ?>
 --EXPECT--
 Simple test of imagecopyresampled() function
-Size of orginal: width=400 height=300
+Size of original: width=400 height=300
 Size of copy: width=200 height=150
 Done
diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
index c9da09b23..e3a3563aa 100644
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@ -1069,7 +1069,7 @@ ZEND_FUNCTION(gmp_powm)
 	zval **base_arg, **exp_arg, **mod_arg;
 	mpz_t *gmpnum_base, *gmpnum_exp, *gmpnum_mod, *gmpnum_result;
 	int use_ui = 0;
-	int temp_base, temp_exp, temp_mod;
+	int temp_base = 0, temp_exp = 0, temp_mod;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ZZZ", &base_arg, &exp_arg, &mod_arg) == FAILURE){
 		return;
@@ -1333,6 +1333,7 @@ ZEND_FUNCTION(gmp_cmp)
 		res = mpz_cmp_si(*gmpnum_a, Z_LVAL_PP(b_arg));
 	} else {
 		res = mpz_cmp(*gmpnum_a, *gmpnum_b);
+		FREE_GMP_TEMP(temp_b);
 	}
 	FREE_GMP_TEMP(temp_a);
 	
diff --git a/ext/hash/tests/hash_file_error.phpt b/ext/hash/tests/hash_file_error.phpt
index 326fbd51a..de7ce55b1 100644
--- a/ext/hash/tests/hash_file_error.phpt
+++ b/ext/hash/tests/hash_file_error.phpt
@@ -23,8 +23,8 @@ file_put_contents( $filename, 'The quick brown fox jumped over the lazy dog.' );
 echo "\n-- Testing hash_file() function with an unknown algorithm --\n";
 var_dump( hash_file( 'foobar', $filename ) );
 
-echo "\n-- Testing hash_file() function with a non-existant file --\n";
-var_dump( hash_file( 'md5', 'nonexistant.txt' ) );
+echo "\n-- Testing hash_file() function with a non-existent file --\n";
+var_dump( hash_file( 'md5', 'nonexistent.txt' ) );
 
 echo "\n-- Testing hash_file() function with less than expected no. of arguments --\n";
 var_dump( hash_file( 'md5' ) );
@@ -50,7 +50,7 @@ unlink( $filename );
 Warning: hash_file(): Unknown hashing algorithm: %s in %s on line %d
 bool(false)
 
--- Testing hash_file() function with a non-existant file --
+-- Testing hash_file() function with a non-existent file --
 
 Warning: hash_file(%s): failed to open stream: No such file or directory in %s on line %d
 bool(false)
diff --git a/ext/hash/tests/mhash_002.phpt b/ext/hash/tests/mhash_002.phpt
index 7bcafd389..45cf09fb7 100644
--- a/ext/hash/tests/mhash_002.phpt
+++ b/ext/hash/tests/mhash_002.phpt
@@ -24,7 +24,7 @@ $supported_hash_al = array(
 "CRC32"     => 4,
 "CRC32B"    => 4,
 "ADLER32"   => 4,
-"NA_XYZ"    => 0   /* verify that the algorythm works */
+"NA_XYZ"    => 0   /* verify that the algorithm works */
 );
 
 $hc = mhash_count() + 1;
diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index 3ad7c107d..3fcf6742d 100644
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -198,9 +198,9 @@ if test "$PHP_IMAP" != "no"; then
       AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.)
     fi
 
-    if test -r "$IMAP_DIR/c-client/c-client.a"; then
+    if test ! -r "$IMAP_DIR/c-client/libc-client.a" && test -r "$IMAP_DIR/c-client/c-client.a" ; then
       ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
-    elif test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
+    elif test ! -r "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" && test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
       ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1
     fi
 
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index b154cb86b..d697fa791 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -1270,7 +1270,6 @@ PHP_FUNCTION(imap_reopen)
 	int mailbox_len;
 	long options = 0, retries = 0;
 	pils *imap_le_struct;
-	MAILSTREAM *imap_stream;
 	long flags=NIL;
 	long cl_flags=NIL;
 
@@ -1298,12 +1297,12 @@ PHP_FUNCTION(imap_reopen)
 		RETURN_FALSE;
 	}
 
-	imap_stream = mail_open(imap_le_struct->imap_stream, mailbox, flags);
-	if (imap_stream == NIL) {
+	imap_le_struct->imap_stream = mail_open(imap_le_struct->imap_stream, mailbox, flags);
+	if (imap_le_struct->imap_stream == NIL) {
+		zend_list_delete(Z_RESVAL_P(streamind));
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't re-open stream");
 		RETURN_FALSE;
 	}
-	imap_le_struct->imap_stream = imap_stream;
 	RETURN_TRUE;
 }
 /* }}} */
diff --git a/ext/imap/tests/imap_include.inc b/ext/imap/tests/imap_include.inc
index ed3623957..b33a10e5e 100644
--- a/ext/imap/tests/imap_include.inc
+++ b/ext/imap/tests/imap_include.inc
@@ -61,7 +61,7 @@ function displayOverviewFields($resp, $fields=null) {
  * @param string mailbox_suffix Suffix used to uniquely identify mailboxes
  * @param int message_count number of test msgs to be written to new mailbox 
  * 
- * @return IMAP stream to new mailbox on sucesss; FALSE on failure
+ * @return IMAP stream to new mailbox on success; FALSE on failure
  */
 function setup_test_mailbox($mailbox_suffix, $message_count, &$new_mailbox = null, $msg_type = "simple"){
 	global $server, $default_mailbox, $username, $password;
diff --git a/ext/interbase/tests/005.phpt b/ext/interbase/tests/005.phpt
index 5b16ac291..c5167c132 100644
--- a/ext/interbase/tests/005.phpt
+++ b/ext/interbase/tests/005.phpt
@@ -18,7 +18,7 @@ InterBase: transactions
     
 /*
 Difference between default and other transactions:
-default commited when you call  ibase_close().
+default committed when you call  ibase_close().
 Other transaction doing rollback.
 
 If you not open default transaction with
@@ -158,7 +158,7 @@ three transaction on default link
 
     ibase_free_result($res);
 
- 	/* tr_4 IBASE_COMMITED + IBASE_REC_NO_VERSION + IBASE_NOWAIT */
+ 	/* tr_4 IBASE_COMMITTED + IBASE_REC_NO_VERSION + IBASE_NOWAIT */
  	$res = ibase_query($tr_4, "select * from test5");
    
  	 echo "three rows in fourth transaction with deadlock\n";
diff --git a/ext/intl/doc/Tutorial.txt b/ext/intl/doc/Tutorial.txt
index 4a66dc184..3bb31b00e 100644
--- a/ext/intl/doc/Tutorial.txt
+++ b/ext/intl/doc/Tutorial.txt
@@ -7,7 +7,7 @@ Examle of locales format: 'en_US', 'ru_UA', 'ua_UA' (see http://demo.icu-project
 
 
 2. Collator::getDisplayName( $obj_locale, $disp_locale ).
-Get name of the object for the desired Locale, in the desired langauge. Both arguments 
+Get name of the object for the desired Locale, in the desired language. Both arguments 
 must be from getAvailableLocales method.
 
      @param  string  $obj_locale   Locale to get display name for.
diff --git a/ext/intl/doc/grapheme_api.php b/ext/intl/doc/grapheme_api.php
index 465453fd3..e22d165cb 100644
--- a/ext/intl/doc/grapheme_api.php
+++ b/ext/intl/doc/grapheme_api.php
@@ -98,7 +98,7 @@
 	 * @param string	$haystack	The input string.
 	 * @param string	$needle		The string to look for.
 	 * @param [boolean]	$before_needle	If TRUE (the default is FALSE), grapheme_strstr() returns the part of the
-						haystack before the first occurence of the needle.
+						haystack before the first occurrence of the needle.
 	 * @return string	Returns the portion of string, or FALSE if needle is not found.
 	*/
 	function grapheme_strstr($haystack, $needle, $before_needle = FALSE) {}
@@ -109,7 +109,7 @@
          * @param string        $haystack       The input string.
          * @param string        $needle         The string to look for.
          * @param [boolean]     $before_needle  If TRUE (the default is FALSE), grapheme_strstr() returns the part of the
-                                                haystack before the first occurence of the needle.
+                                                haystack before the first occurrence of the needle.
          * @return string       Returns the portion of string, or FALSE if needle is not found.
         */
         function grapheme_stristr($haystack, $needle, $before_needle = FALSE) {}
diff --git a/ext/intl/doc/msgfmt_api.php b/ext/intl/doc/msgfmt_api.php
index e4d047b97..3df6f0de1 100644
--- a/ext/intl/doc/msgfmt_api.php
+++ b/ext/intl/doc/msgfmt_api.php
@@ -31,7 +31,7 @@ class MessageFormatter {
 	/**
 	 * Format the message
 	 * @param   array   $args   arguments to insert into the pattern string
-	 * @return  string  the formatted string, or false if an error ocurred
+	 * @return  string  the formatted string, or false if an error occurred
 	 */
 	public function format($args) {}
 
@@ -124,7 +124,7 @@ class MessageFormatter {
 	 * Format the message
 	 * @param MessageFormatter $fmt The message formatter 
 	 * @param   array   $args   arguments to insert into the pattern string
-	 * @return  string  the formatted string, or false if an error ocurred
+	 * @return  string  the formatted string, or false if an error occurred
 	 */
 	function msgfmt_format($fmt, $args) {}
 
diff --git a/ext/intl/grapheme/grapheme_string.c b/ext/intl/grapheme/grapheme_string.c
index 475bbe418..8a094e015 100644
--- a/ext/intl/grapheme/grapheme_string.c
+++ b/ext/intl/grapheme/grapheme_string.c
@@ -113,7 +113,7 @@ PHP_FUNCTION(grapheme_strpos)
 	unsigned char *found;
 	long loffset = 0;
 	int32_t offset = 0;
-	int ret_pos, uchar_pos;
+	int ret_pos;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &loffset) == FAILURE) {
 
@@ -160,10 +160,10 @@ PHP_FUNCTION(grapheme_strpos)
 	}
 
 	/* do utf16 part of the strpos */
-	ret_pos = grapheme_strpos_utf16(haystack, haystack_len, needle, needle_len, offset, &uchar_pos, 0 /* fIgnoreCase */ TSRMLS_CC );
+	ret_pos = grapheme_strpos_utf16(haystack, haystack_len, needle, needle_len, offset, NULL, 0 /* fIgnoreCase */, 0 /* last */ TSRMLS_CC );
 
 	if ( ret_pos >= 0 ) {
-		RETURN_LONG(ret_pos + offset);
+		RETURN_LONG(ret_pos);
 	} else {
 		RETURN_FALSE;
 	}
@@ -180,7 +180,7 @@ PHP_FUNCTION(grapheme_stripos)
 	unsigned char *found;
 	long loffset = 0;
 	int32_t offset = 0;
-	int ret_pos, uchar_pos;
+	int ret_pos;
 	int is_ascii;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|l", (char **)&haystack, &haystack_len, (char **)&needle, &needle_len, &loffset) == FAILURE) {
@@ -235,10 +235,10 @@ PHP_FUNCTION(grapheme_stripos)
 	}
 
 	/* do utf16 part of the strpos */
-	ret_pos = grapheme_strpos_utf16(haystack, haystack_len, needle, needle_len, offset, &uchar_pos, 1 /* fIgnoreCase */ TSRMLS_CC );
+	ret_pos = grapheme_strpos_utf16(haystack, haystack_len, needle, needle_len, offset, NULL, 1 /* fIgnoreCase */, 0 /*last */ TSRMLS_CC );
 
 	if ( ret_pos >= 0 ) {
-		RETURN_LONG(ret_pos + offset);
+		RETURN_LONG(ret_pos);
 	} else {
 		RETURN_FALSE;
 	}
@@ -304,7 +304,7 @@ PHP_FUNCTION(grapheme_strrpos)
 		/* else we need to continue via utf16 */
 	}
 
-	ret_pos = grapheme_strrpos_utf16(haystack, haystack_len, needle, needle_len, offset, 0 /* f_ignore_case */ TSRMLS_CC);
+	ret_pos = grapheme_strpos_utf16(haystack, haystack_len, needle, needle_len, offset, NULL, 0 /* f_ignore_case */, 1/* last */ TSRMLS_CC);
 
 	if ( ret_pos >= 0 ) {
 		RETURN_LONG(ret_pos);
@@ -382,7 +382,7 @@ PHP_FUNCTION(grapheme_strripos)
 		/* else we need to continue via utf16 */
 	}
 
-	ret_pos = grapheme_strrpos_utf16(haystack, haystack_len, needle, needle_len, offset, 1 /* f_ignore_case */ TSRMLS_CC);
+	ret_pos = grapheme_strpos_utf16(haystack, haystack_len, needle, needle_len, offset, NULL,  1 /* f_ignore_case */, 1 /*last */ TSRMLS_CC);
 
 	if ( ret_pos >= 0 ) {
 		RETURN_LONG(ret_pos);
@@ -434,6 +434,7 @@ PHP_FUNCTION(grapheme_substr)
 		grapheme_substr_ascii((char *)str, str_len, start, length, ZEND_NUM_ARGS(), (char **) &sub_str, &sub_str_len);
 
 		if ( NULL == sub_str ) {
+			intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_substr: invalid parameters", 1 TSRMLS_CC );
 			RETURN_FALSE;
 		}
 
@@ -530,6 +531,15 @@ PHP_FUNCTION(grapheme_substr)
 		RETURN_STRINGL(((char *)sub_str), sub_str_len, 0);
 	}
 
+	if(length == 0) {
+		/* empty length - we've validated start, we can return "" now */
+		if (ustr) {
+			efree(ustr);
+		}
+		ubrk_close(bi);
+		RETURN_EMPTY_STRING();		
+	}
+
 	/* find the end point of the string to return */
 
 	if ( length < 0 ) {
@@ -554,25 +564,31 @@ PHP_FUNCTION(grapheme_substr)
 		length += iter_val;
 	}
 
+	ubrk_close(bi);
+
 	if ( UBRK_DONE == sub_str_end_pos) {
 		if(length < 0) {
-
 			intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_substr: length not contained in string", 1 TSRMLS_CC );
 
 			efree(ustr);
-			ubrk_close(bi);
 			RETURN_FALSE;
 		} else {
 			sub_str_end_pos = ustr_len;
 		}
 	}
+	
+	if(sub_str_start_pos > sub_str_end_pos) {
+		intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_substr: length is beyond start", 1 TSRMLS_CC );
+
+		efree(ustr);
+		RETURN_FALSE;
+	}
 
 	sub_str = NULL;
 	status = U_ZERO_ERROR;
 	intl_convert_utf16_to_utf8((char **)&sub_str, &sub_str_len, ustr + sub_str_start_pos, ( sub_str_end_pos - sub_str_start_pos ), &status);
 
 	efree( ustr );
-	ubrk_close( bi );
 
 	if ( U_FAILURE( status ) ) {
 		/* Set global error code. */
@@ -643,7 +659,7 @@ static void strstr_common_handler(INTERNAL_FUNCTION_PARAMETERS, int f_ignore_cas
 	}
 
 	/* need to work in utf16 */
-	ret_pos = grapheme_strpos_utf16(haystack, haystack_len, needle, needle_len, 0, &uchar_pos, f_ignore_case TSRMLS_CC );
+	ret_pos = grapheme_strpos_utf16(haystack, haystack_len, needle, needle_len, 0, &uchar_pos, f_ignore_case, 0 /*last */ TSRMLS_CC );
 
 	if ( ret_pos < 0 ) {
 		RETURN_FALSE;
diff --git a/ext/intl/grapheme/grapheme_util.c b/ext/intl/grapheme/grapheme_util.c
index 92008554d..c752b0237 100644
--- a/ext/intl/grapheme/grapheme_util.c
+++ b/ext/intl/grapheme/grapheme_util.c
@@ -28,6 +28,7 @@
 #include <unicode/ucol.h>
 #include <unicode/ustring.h>
 #include <unicode/ubrk.h>
+#include <unicode/usearch.h>
 
 #include "ext/standard/php_string.h"
 
@@ -47,49 +48,8 @@ grapheme_close_global_iterator( TSRMLS_D )
 }
 /* }}} */
 
-/* {{{ grapheme_intl_case_fold: convert string to lowercase */
-void
-grapheme_intl_case_fold(UChar** ptr_to_free, UChar **str, int32_t *str_len, UErrorCode *pstatus )
-{
-    UChar *dest;
-    int32_t dest_len, size_required;
-
-    /* allocate a destination string that is a bit larger than the src, hoping that is enough */
-    dest_len = (*str_len) + ( *str_len / 10 );
-    dest = (UChar*) eumalloc(dest_len);
-
-    *pstatus = U_ZERO_ERROR;
-    size_required = u_strFoldCase(dest, dest_len, *str, *str_len, U_FOLD_CASE_DEFAULT, pstatus);
-
-    dest_len = size_required;
-
-    if ( U_BUFFER_OVERFLOW_ERROR == *pstatus ) {
-
-        dest = (UChar*) eurealloc(dest, dest_len);
-
-        *pstatus = U_ZERO_ERROR;
-        size_required = u_strFoldCase(dest, dest_len, *str, *str_len, U_FOLD_CASE_DEFAULT, pstatus);
-    }
-
-    if ( U_FAILURE(*pstatus) ) {
-        return;
-    }
-
-    if ( NULL != ptr_to_free) {
-        efree(*ptr_to_free);
-        *ptr_to_free = dest;
-    }
-
-    *str = dest;
-    *str_len = dest_len;
-
-    return;
-}
-/* }}} */
-
 /* {{{ grapheme_substr_ascii f='from' - starting point, l='length' */
-void
-grapheme_substr_ascii(char *str, int str_len, int f, int l, int argc, char **sub_str, int *sub_str_len)
+void grapheme_substr_ascii(char *str, int str_len, int f, int l, int argc, char **sub_str, int *sub_str_len)
 {
     *sub_str = NULL;
 
@@ -147,225 +107,101 @@ grapheme_substr_ascii(char *str, int str_len, int f, int l, int argc, char **sub
 }
 /* }}} */
 
-/* {{{ grapheme_strrpos_utf16 - strrpos using utf16 */
-int
-grapheme_strrpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigned char*needle, int32_t needle_len, int32_t offset, int f_ignore_case TSRMLS_DC)
-{
-    UChar *uhaystack, *puhaystack, *uhaystack_end, *uneedle;
-    int32_t uhaystack_len, uneedle_len;
-    UErrorCode status;
-    unsigned char u_break_iterator_buffer[U_BRK_SAFECLONE_BUFFERSIZE];
-    UBreakIterator* bi = NULL;
-    int ret_pos, pos;
-
-    /* convert the strings to UTF-16. */
-    uhaystack = NULL;
-    uhaystack_len = 0;
-    status = U_ZERO_ERROR;
-    intl_convert_utf8_to_utf16(&uhaystack, &uhaystack_len, (char *) haystack, haystack_len, &status );
-
-    if ( U_FAILURE( status ) ) {
-        /* Set global error code. */
-        intl_error_set_code( NULL, status TSRMLS_CC );
-
-        /* Set error messages. */
-        intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 0 TSRMLS_CC );
-        if (uhaystack) {
-			efree( uhaystack );
-		}
-        return -1;
-    }
-
-    if ( f_ignore_case ) {
-        grapheme_intl_case_fold(&uhaystack, &uhaystack, &uhaystack_len, &status );
-    }
-
-    /* get a pointer to the haystack taking into account the offset */
-    bi = NULL;
-    status = U_ZERO_ERROR;
-    bi = grapheme_get_break_iterator(u_break_iterator_buffer, &status TSRMLS_CC );
-
-    puhaystack = grapheme_get_haystack_offset(bi, uhaystack, uhaystack_len, offset);
-
-    if ( NULL == puhaystack ) {
-        intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_strpos: Offset not contained in string", 1 TSRMLS_CC );
-        if (uhaystack) {
-			efree( uhaystack );
-		}
-        ubrk_close (bi);
-        return -1;
-    }
-
-    uneedle = NULL;
-    uneedle_len = 0;
-    status = U_ZERO_ERROR;
-    intl_convert_utf8_to_utf16(&uneedle, &uneedle_len, (char *) needle, needle_len, &status );
-
-    if ( U_FAILURE( status ) ) {
-        /* Set global error code. */
-        intl_error_set_code( NULL, status TSRMLS_CC );
-
-        /* Set error messages. */
-        intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 0 TSRMLS_CC );
-        if (uhaystack) {
-			efree( uhaystack );
-		}
-		if (uneedle) {
-			efree( uneedle );
-		}
-        ubrk_close (bi);
-        return -1;
-    }
-
-    if ( f_ignore_case ) {
-        grapheme_intl_case_fold(&uneedle, &uneedle, &uneedle_len, &status );
-    }
-
-    ret_pos = -1;   /* -1 represents 'not found' */
-
-    /* back up until there's needle_len characters to compare */
-
-    uhaystack_end = uhaystack + uhaystack_len;
-    pos = ubrk_last(bi);
-    puhaystack = uhaystack + pos;
-
-    while ( uhaystack_end - puhaystack < uneedle_len ) {
-
-        pos = ubrk_previous(bi);
-
-        if ( UBRK_DONE == pos ) {
-            break;
-        }
-
-        puhaystack = uhaystack + pos;
-    }
-
-    /* is there enough haystack left to hold the needle? */
-    if ( ( uhaystack_end - puhaystack ) < uneedle_len ) {
-        /* not enough, not found */
-        goto exit;
-    }
-
-    while ( UBRK_DONE != pos ) {
-
-        if (!u_memcmp(uneedle, puhaystack, uneedle_len)) {  /* needle_len - 1 in zend memnstr? */
-
-            /* does the grapheme in the haystack end at the same place as the last grapheme in the needle? */
-
-            if ( ubrk_isBoundary(bi, pos + uneedle_len) ) {
-
-                /* found it, get grapheme count offset */
-                ret_pos = grapheme_count_graphemes(bi, uhaystack, pos);
-                break;
-            }
-
-            /* set position back */
-            ubrk_isBoundary(bi, pos);
-        }
-
-        pos = ubrk_previous(bi);
-        puhaystack = uhaystack + pos;
-    }
-
-exit:
-	if (uhaystack) {
-		efree( uhaystack );
-	}
-	if (uneedle) {
-		efree( uneedle );
+#define STRPOS_CHECK_STATUS(status, error) 							\
+	if ( U_FAILURE( (status) ) ) { 									\
+		intl_error_set_code( NULL, (status) TSRMLS_CC ); 			\
+		intl_error_set_custom_msg( NULL, (error), 0 TSRMLS_CC ); 	\
+		if (uhaystack) { 											\
+			efree( uhaystack ); 									\
+		} 															\
+		if (uneedle) { 												\
+			efree( uneedle ); 										\
+		} 															\
+		if(bi) { 													\
+			ubrk_close (bi); 										\
+		} 															\
+		if(src) {													\
+			usearch_close(src);										\
+		}															\
+		return -1; 													\
 	}
-    ubrk_close (bi);
-
-    return ret_pos;
-}
 
-/* }}} */
 
 /* {{{ grapheme_strpos_utf16 - strrpos using utf16*/
-int
-grapheme_strpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigned char*needle, int32_t needle_len, int32_t offset, int32_t *puchar_pos, int f_ignore_case TSRMLS_DC)
+int grapheme_strpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigned char*needle, int32_t needle_len, int32_t offset, int32_t *puchar_pos, int f_ignore_case, int last TSRMLS_DC)
 {
-	UChar *uhaystack, *puhaystack, *uneedle;
-	int32_t uhaystack_len, uneedle_len;
-	int ret_pos;
+	UChar *uhaystack = NULL, *uneedle = NULL;
+	int32_t uhaystack_len = 0, uneedle_len = 0, char_pos, ret_pos, offset_pos = 0;
 	unsigned char u_break_iterator_buffer[U_BRK_SAFECLONE_BUFFERSIZE];
-	UBreakIterator* bi;
+	UBreakIterator* bi = NULL;
 	UErrorCode status;
+	UStringSearch* src = NULL;
+	UCollator *coll;
 
-	*puchar_pos = -1;
-
+	if(puchar_pos) {
+		*puchar_pos = -1;
+	}
 	/* convert the strings to UTF-16. */
 
-	uhaystack = NULL;
-	uhaystack_len = 0;
 	status = U_ZERO_ERROR;
 	intl_convert_utf8_to_utf16(&uhaystack, &uhaystack_len, (char *) haystack, haystack_len, &status );
+	STRPOS_CHECK_STATUS(status, "Error converting input string to UTF-16");
 
-	if ( U_FAILURE( status ) ) {
-		/* Set global error code. */
-		intl_error_set_code( NULL, status TSRMLS_CC );
-
-		/* Set error messages. */
-		intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 0 TSRMLS_CC );
-		if (uhaystack) {
-			efree( uhaystack );
-		}
-		return -1;
-	}
+	status = U_ZERO_ERROR;
+	intl_convert_utf8_to_utf16(&uneedle, &uneedle_len, (char *) needle, needle_len, &status );
+	STRPOS_CHECK_STATUS(status, "Error converting input string to UTF-16");
 
 	/* get a pointer to the haystack taking into account the offset */
-	bi = NULL;
 	status = U_ZERO_ERROR;
 	bi = grapheme_get_break_iterator(u_break_iterator_buffer, &status TSRMLS_CC );
-	
-	puhaystack = grapheme_get_haystack_offset(bi, uhaystack, uhaystack_len, offset);
-	uhaystack_len = (uhaystack_len - ( puhaystack - uhaystack));
+	STRPOS_CHECK_STATUS(status, "Failed to get iterator");
+	status = U_ZERO_ERROR;
+	ubrk_setText(bi, uhaystack, uhaystack_len, &status);
+	STRPOS_CHECK_STATUS(status, "Failed to set up iterator");
 
-	if ( NULL == puhaystack ) {
-	
-		intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "grapheme_strpos: Offset not contained in string", 1 TSRMLS_CC );
-		if (uhaystack) {
-			efree( uhaystack );
-		}
-		ubrk_close (bi);
-					
-		return -1;
-	}
+	status = U_ZERO_ERROR;
+	src = usearch_open(uneedle, uneedle_len, uhaystack, uhaystack_len, "", bi, &status);
+	STRPOS_CHECK_STATUS(status, "Error creating search object");
 
-	if ( f_ignore_case ) {
-		grapheme_intl_case_fold(&uhaystack, &puhaystack, &uhaystack_len, &status );
+	if(f_ignore_case) {
+		coll = usearch_getCollator(src);
+		status = U_ZERO_ERROR;
+		ucol_setAttribute(coll, UCOL_STRENGTH, UCOL_SECONDARY, &status);
+		STRPOS_CHECK_STATUS(status, "Error setting collation strength");
+		usearch_reset(src);
 	}
 
-	uneedle = NULL;
-	uneedle_len = 0;
-	status = U_ZERO_ERROR;
-	intl_convert_utf8_to_utf16(&uneedle, &uneedle_len, (char *) needle, needle_len, &status );
+	if(offset != 0) {
+		offset_pos = grapheme_get_haystack_offset(bi, offset);
+		if(offset_pos == -1) {
+			status = U_ILLEGAL_ARGUMENT_ERROR;
+			STRPOS_CHECK_STATUS(status, "Invalid search offset");	
+		}
+		status = U_ZERO_ERROR;
+		usearch_setOffset(src, offset_pos, &status);	
+		STRPOS_CHECK_STATUS(status, "Invalid search offset");
+	}
 
-	if ( U_FAILURE( status ) ) {
-		/* Set global error code. */
-		intl_error_set_code( NULL, status TSRMLS_CC );
 
-		/* Set error messages. */
-		intl_error_set_custom_msg( NULL, "Error converting input string to UTF-16", 0 TSRMLS_CC );
-		if (uhaystack) {
-			efree( uhaystack );
+	if(last) {
+		char_pos = usearch_last(src, &status);
+		if(char_pos < offset_pos) {
+			/* last one is beyound our start offset */
+			char_pos = USEARCH_DONE;
 		}
-		if (uneedle) {
-			efree( uneedle );
-		}
-		ubrk_close (bi);
-		
-		return -1;
+	} else {
+		char_pos = usearch_next(src, &status);
 	}
-
-	if ( f_ignore_case ) {
-		grapheme_intl_case_fold(&uneedle, &uneedle, &uneedle_len, &status );
+	STRPOS_CHECK_STATUS(status, "Error looking up string");
+	if(char_pos != USEARCH_DONE && ubrk_isBoundary(bi, char_pos)) {
+		ret_pos = grapheme_count_graphemes(bi, uhaystack,char_pos);
+		if(puchar_pos) {
+			*puchar_pos = char_pos;
+		}
+	} else {
+		ret_pos = -1;
 	}
 
-	ret_pos = grapheme_memnstr_grapheme(bi, puhaystack, uneedle, uneedle_len, puhaystack + uhaystack_len );
-	
-	*puchar_pos = ubrk_current(bi);
-
 	if (uhaystack) {
 		efree( uhaystack );
 	}
@@ -373,6 +209,7 @@ grapheme_strpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigned ch
 		efree( uneedle );
 	}
 	ubrk_close (bi);
+	usearch_close (src);
 
 	return ret_pos;
 }
@@ -432,8 +269,7 @@ int grapheme_split_string(const UChar *text, int32_t text_length, int boundary_a
 /* }}} */
 
 /* {{{ grapheme_count_graphemes */
-int32_t
-grapheme_count_graphemes(UBreakIterator *bi, UChar *string, int32_t string_len)
+int32_t grapheme_count_graphemes(UBreakIterator *bi, UChar *string, int32_t string_len)
 {
 	int ret_len = 0;
 	int pos = 0;
@@ -455,85 +291,16 @@ grapheme_count_graphemes(UBreakIterator *bi, UChar *string, int32_t string_len)
 }
 /* }}} */
 
-/* {{{ grapheme_memnstr_grapheme: find needle in haystack using grapheme boundaries */
-int32_t
-grapheme_memnstr_grapheme(UBreakIterator *bi, UChar *haystack, UChar *needle, int32_t needle_len, UChar *end)
-{
-	UChar *p = haystack;
-	UChar ne = needle[needle_len-1];
-	UErrorCode status;
-	int32_t grapheme_offset;
-	
-	end -= needle_len;
-
-	while (p <= end) {
-
-		if ((p = u_memchr(p, *needle, (end-p+1))) && ne == p[needle_len-1]) {
-
-			if (!u_memcmp(needle, p, needle_len - 1)) {  /* needle_len - 1 works because if needle_len is 1, we've already tested the char */
-
-				/* does the grapheme end here? */
-
-				status = U_ZERO_ERROR;
-				ubrk_setText (bi, haystack, (end - haystack) + needle_len, &status);
-
-				if ( ubrk_isBoundary (bi, (p - haystack) + needle_len) ) {
-
-					/* found it, get grapheme count offset */
-					grapheme_offset = grapheme_count_graphemes(bi, haystack, (p - haystack));
-
-					return grapheme_offset;
-				}
-			}
-		}
-
-		if (p == NULL) {
-			return -1;
-		}
-
-		p++;
-	}
-
-	return -1;
-}
-
-/* }}} */
-
-/* {{{ grapheme_memrstr_grapheme: reverse find needle in haystack using grapheme boundaries */
-inline void *grapheme_memrchr_grapheme(const void *s, int c, int32_t n)
-{
-	register unsigned char *e;
-
-	if (n <= 0) {
-		return NULL;
-	}
-
-	for (e = (unsigned char *)s + n - 1; e >= (unsigned char *)s; e--) {
-		if (*e == (unsigned char)c) {
-			return (void *)e;
-		}
-	}
-
-	return NULL;
-}
-/* }}} */
 
 /* {{{ 	grapheme_get_haystack_offset - bump the haystack pointer based on the grapheme count offset */
-UChar *
-grapheme_get_haystack_offset(UBreakIterator* bi, UChar *uhaystack, int32_t uhaystack_len, int32_t offset)
+int grapheme_get_haystack_offset(UBreakIterator* bi, int32_t offset)
 {
-	UErrorCode		status;
 	int32_t pos;
 	int32_t (*iter_op)(UBreakIterator* bi);
 	int iter_incr;
 
-	if ( NULL != bi ) {
-		status = U_ZERO_ERROR;
-		ubrk_setText (bi, uhaystack, uhaystack_len, &status);
-	}
-
 	if ( 0 == offset ) {
-		return uhaystack;
+		return 0;
 	}
 	
 	if ( offset < 0 ) {
@@ -558,10 +325,10 @@ grapheme_get_haystack_offset(UBreakIterator* bi, UChar *uhaystack, int32_t uhays
 	}
 
 	if ( offset != 0 ) {
-		return NULL;
+		return -1;
 	}
 	
-	return uhaystack + pos;
+	return pos;
 }
 /* }}} */
 
@@ -607,8 +374,7 @@ grapheme_strrpos_ascii(unsigned char *haystack, int32_t haystack_len, unsigned c
 /* }}} */
 
 /* {{{ grapheme_get_break_iterator: get a clone of the global character break iterator */
-UBreakIterator* 
-grapheme_get_break_iterator(void *stack_buffer, UErrorCode *status TSRMLS_DC )
+UBreakIterator* grapheme_get_break_iterator(void *stack_buffer, UErrorCode *status TSRMLS_DC )
 {
 	int32_t buffer_size;
 
diff --git a/ext/intl/grapheme/grapheme_util.h b/ext/intl/grapheme/grapheme_util.h
index c91aeaff7..14f3f22c4 100644
--- a/ext/intl/grapheme/grapheme_util.h
+++ b/ext/intl/grapheme/grapheme_util.h
@@ -23,35 +23,25 @@
 /* get_break_interator: get a break iterator from the global structure */
 UBreakIterator* grapheme_get_break_iterator(void *stack_buffer, UErrorCode *status TSRMLS_DC );
 
-void
-grapheme_substr_ascii(char *str, int32_t str_len, int32_t f, int32_t l, int argc, char **sub_str, int *sub_str_len);
+void grapheme_substr_ascii(char *str, int32_t str_len, int32_t f, int32_t l, int argc, char **sub_str, int *sub_str_len);
 
-int
-grapheme_strrpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigned char*needle, int32_t needle_len, int32_t offset, int f_ignore_case TSRMLS_DC);
+int grapheme_strrpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigned char*needle, int32_t needle_len, int32_t offset, int f_ignore_case TSRMLS_DC);
 
-int
-grapheme_strpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigned char*needle, int32_t needle_len, int32_t offset, int *puchar_pos, int f_ignore_case TSRMLS_DC);
+int grapheme_strpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigned char*needle, int32_t needle_len, int32_t offset, int *puchar_pos, int f_ignore_case, int last TSRMLS_DC);
 
 int grapheme_ascii_check(const unsigned char *day, int32_t len);
 
 int grapheme_split_string(const UChar *text, int32_t text_length, int boundary_array[], int boundary_array_len TSRMLS_DC );
 
-int32_t
-grapheme_count_graphemes(UBreakIterator *bi, UChar *string, int32_t string_len);
-
-int32_t
-grapheme_memnstr_grapheme(UBreakIterator *bi, UChar *haystack, UChar *needle, int32_t needle_len, UChar *end);
+int32_t grapheme_count_graphemes(UBreakIterator *bi, UChar *string, int32_t string_len);
 
 inline void *grapheme_memrchr_grapheme(const void *s, int c, int32_t n);
 
-UChar *
-grapheme_get_haystack_offset(UBreakIterator* bi, UChar *uhaystack, int32_t uhaystack_len, int32_t offset);
+int grapheme_get_haystack_offset(UBreakIterator* bi, int32_t offset);
 
-int32_t
-grapheme_strrpos_ascii(unsigned char *haystack, int32_t haystack_len, unsigned char *needle, int32_t needle_len, int32_t offset);
+int32_t grapheme_strrpos_ascii(unsigned char *haystack, int32_t haystack_len, unsigned char *needle, int32_t needle_len, int32_t offset);
 
-UBreakIterator* 
-grapheme_get_break_iterator(void *stack_buffer, UErrorCode *status TSRMLS_DC );
+UBreakIterator* grapheme_get_break_iterator(void *stack_buffer, UErrorCode *status TSRMLS_DC );
 
 /* OUTSIDE_STRING: check if (possibly negative) long offset is outside the string with int32_t length */
 #define OUTSIDE_STRING(offset, max_len) ( offset <= INT32_MIN || offset > INT32_MAX || (offset < 0 ? -offset > (long) max_len : offset >= (long) max_len) )
diff --git a/ext/intl/resourcebundle/resourcebundle.c b/ext/intl/resourcebundle/resourcebundle.c
index 6d39dfb7e..f5475faf1 100644
--- a/ext/intl/resourcebundle/resourcebundle.c
+++ b/ext/intl/resourcebundle/resourcebundle.c
@@ -41,7 +41,7 @@ void resourcebundle_extract_value( zval *return_value, ResourceBundle_object *so
 		case URES_STRING:
 			ufield = ures_getString( source->child, &ilen, &INTL_DATA_ERROR_CODE(source) );
 			INTL_METHOD_CHECK_STATUS(source, "Failed to retrieve string value");
-			INTL_METHOD_RETVAL_UTF8(source, ufield, ilen, 0);
+			INTL_METHOD_RETVAL_UTF8(source, (UChar *)ufield, ilen, 0);
 			break;
 
 		case URES_BINARY:
diff --git a/ext/intl/resourcebundle/resourcebundle_class.c b/ext/intl/resourcebundle/resourcebundle_class.c
index a6a73f5f0..7c1a5c28b 100644
--- a/ext/intl/resourcebundle/resourcebundle_class.c
+++ b/ext/intl/resourcebundle/resourcebundle_class.c
@@ -162,8 +162,8 @@ PHP_FUNCTION( resourcebundle_create )
 /* {{{ resourcebundle_array_fetch */
 static void resourcebundle_array_fetch(zval *object, zval *offset, zval *return_value, int fallback TSRMLS_DC) 
 {
-	int32_t     meindex;
-	char *      mekey;
+	int32_t     meindex = 0;
+	char *      mekey = NULL;
 	long        mekeylen;
     zend_bool    is_numeric = 0;
 	char         *pbuf;
diff --git a/ext/intl/tests/badargs.phpt b/ext/intl/tests/badargs.phpt
index 9232bbf0c..264af73ac 100644
--- a/ext/intl/tests/badargs.phpt
+++ b/ext/intl/tests/badargs.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Check that bad argumens return the same
+Check that bad arguments return the same
 --SKIPIF--
 <?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
 --FILE--
diff --git a/ext/intl/tests/bug61860.phpt b/ext/intl/tests/bug61860.phpt
new file mode 100644
index 000000000..123d9ff23
--- /dev/null
+++ b/ext/intl/tests/bug61860.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Bug #61860: Offsets may be wrong for grapheme_stri* functions
+--SKIPIF--
+<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+--FILE--
+<?php
+$haystack = 'Auf der Straße nach Paris habe ich mit dem Fahrer gesprochen';
+var_dump(
+    grapheme_stripos($haystack, 'pariS '),
+    grapheme_stristr($haystack, 'paRis '),
+    grapheme_substr($haystack, grapheme_stripos($haystack, 'Paris'))
+);
+
+?>
+--EXPECT--
+int(20)
+string(40) "Paris habe ich mit dem Fahrer gesprochen"
+string(40) "Paris habe ich mit dem Fahrer gesprochen"
diff --git a/ext/intl/tests/bug62759.phpt b/ext/intl/tests/bug62759.phpt
new file mode 100644
index 000000000..d4126b752
--- /dev/null
+++ b/ext/intl/tests/bug62759.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Bug #62759: Buggy grapheme_substr() on edge case
+--SKIPIF--
+<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?>
+--FILE--
+<?php
+var_dump(substr('deja', 1, -4));
+var_dump(substr('deja', -1, 0));
+var_dump(grapheme_substr('deja', 1, -4));
+var_dump(intl_get_error_message());
+var_dump(grapheme_substr('deja', -1, 0));
+var_dump(grapheme_substr('déjà', 1, -4));
+var_dump(intl_get_error_message());
+var_dump(grapheme_substr('déjà', -1, 0));
+?>
+--EXPECT--
+bool(false)
+string(0) ""
+bool(false)
+string(61) "grapheme_substr: invalid parameters: U_ILLEGAL_ARGUMENT_ERROR"
+string(0) ""
+bool(false)
+string(65) "grapheme_substr: length is beyond start: U_ILLEGAL_ARGUMENT_ERROR"
+string(0) ""
diff --git a/ext/intl/tests/transliterator_create_error.phpt b/ext/intl/tests/transliterator_create_error.phpt
index 31aef68fe..4f2d04ae7 100644
--- a/ext/intl/tests/transliterator_create_error.phpt
+++ b/ext/intl/tests/transliterator_create_error.phpt
@@ -6,15 +6,15 @@ Transliterator::create (error)
 <?php
 
 ini_set("intl.error_level", E_WARNING);
-Transliterator::create("inexistant id");
+Transliterator::create("inexistent id");
 echo intl_get_error_message(), "\n";
 Transliterator::create("bad UTF-8 \x8F");
 echo intl_get_error_message(), "\n";
 
 echo "Done.\n";
 --EXPECTF--
-Warning: Transliterator::create(): transliterator_create: unable to open ICU transliterator with id "inexistant id" in %s on line %d
-transliterator_create: unable to open ICU transliterator with id "inexistant id": U_INVALID_ID
+Warning: Transliterator::create(): transliterator_create: unable to open ICU transliterator with id "inexistent id" in %s on line %d
+transliterator_create: unable to open ICU transliterator with id "inexistent id": U_INVALID_ID
 
 Warning: Transliterator::create(): String conversion of id to UTF-16 failed in %s on line %d
 String conversion of id to UTF-16 failed: U_INVALID_CHAR_FOUND
diff --git a/ext/intl/tests/transliterator_transliterate_variant1.phpt b/ext/intl/tests/transliterator_transliterate_variant1.phpt
index fc77a4e3a..dcd01efd4 100644
--- a/ext/intl/tests/transliterator_transliterate_variant1.phpt
+++ b/ext/intl/tests/transliterator_transliterate_variant1.phpt
@@ -13,7 +13,7 @@ echo transliterator_transliterate("\x8F", $str), "\n";
 echo intl_get_error_message(), "\n";
 
 class A {
-function __toString() { return "inexistant id"; }
+function __toString() { return "inexistent id"; }
 }
 
 echo transliterator_transliterate(new A(), $str), "\n";
@@ -29,9 +29,9 @@ Warning: transliterator_transliterate(): Could not create transliterator with ID
 
 String conversion of id to UTF-16 failed: U_INVALID_CHAR_FOUND
 
-Warning: transliterator_transliterate(): transliterator_create: unable to open ICU transliterator with id "inexistant id" in %s on line %d
+Warning: transliterator_transliterate(): transliterator_create: unable to open ICU transliterator with id "inexistent id" in %s on line %d
 
-Warning: transliterator_transliterate(): Could not create transliterator with ID "inexistant id" (transliterator_create: unable to open ICU transliterator with id "inexistant id": U_INVALID_ID) in %s on line %d
+Warning: transliterator_transliterate(): Could not create transliterator with ID "inexistent id" (transliterator_create: unable to open ICU transliterator with id "inexistent id": U_INVALID_ID) in %s on line %d
 
-transliterator_create: unable to open ICU transliterator with id "inexistant id": U_INVALID_ID
+transliterator_create: unable to open ICU transliterator with id "inexistent id": U_INVALID_ID
 Done.
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 3cfa2092e..71d57d6d9 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -2107,6 +2107,7 @@ PHP_FUNCTION(ldap_set_rebind_proc)
 		/* unregister rebind procedure */
 		if (ld->rebindproc != NULL) {
 			zval_dtor(ld->rebindproc);
+			FREE_ZVAL(ld->rebindproc);
 			ld->rebindproc = NULL;
 			ldap_set_rebind_proc(ld->link, NULL, NULL);
 		}
diff --git a/ext/ldap/tests/ldap_get_values_len_error.phpt b/ext/ldap/tests/ldap_get_values_len_error.phpt
index 8caea1479..45f9031df 100644
--- a/ext/ldap/tests/ldap_get_values_len_error.phpt
+++ b/ext/ldap/tests/ldap_get_values_len_error.phpt
@@ -20,7 +20,7 @@ var_dump(ldap_get_values_len($link));
 var_dump(ldap_get_values_len($link, $entry));
 var_dump(ldap_get_values_len($link, $entry, "weirdAttribute", "Additional data"));
 
-var_dump(ldap_get_values_len($link, $entry, "inexistantAttribute"));
+var_dump(ldap_get_values_len($link, $entry, "inexistentAttribute"));
 ?>
 ===DONE===
 --CLEAN--
diff --git a/ext/ldap/tests/ldap_search_variation6.phpt b/ext/ldap/tests/ldap_search_variation6.phpt
index a29e4524d..5139ebb77 100644
--- a/ext/ldap/tests/ldap_search_variation6.phpt
+++ b/ext/ldap/tests/ldap_search_variation6.phpt
@@ -217,14 +217,26 @@ array(2) {
   [1]=>
   resource(%d) of type (ldap result)
 }
-NULL
-NULL
+array(1) {
+  ["count"]=>
+  int(0)
+}
+array(1) {
+  ["count"]=>
+  int(0)
+}
 array(2) {
   [0]=>
   resource(%d) of type (ldap result)
   [1]=>
   resource(%d) of type (ldap result)
 }
-NULL
-NULL
+array(1) {
+  ["count"]=>
+  int(0)
+}
+array(1) {
+  ["count"]=>
+  int(0)
+}
 ===DONE===
diff --git a/ext/ldap/tests/ldap_set_rebind_proc_error.phpt b/ext/ldap/tests/ldap_set_rebind_proc_error.phpt
index 966612f65..c8c798582 100644
--- a/ext/ldap/tests/ldap_set_rebind_proc_error.phpt
+++ b/ext/ldap/tests/ldap_set_rebind_proc_error.phpt
@@ -35,7 +35,7 @@ function rebind_proc ($ds, $ldap_url) {
 $link = ldap_connect($host, $port);
 var_dump(ldap_set_rebind_proc($link));
 var_dump(ldap_set_rebind_proc($link, "rebind_proc", "Additional data"));
-var_dump(ldap_set_rebind_proc($link, "rebind_proc_inexistant"));
+var_dump(ldap_set_rebind_proc($link, "rebind_proc_inexistent"));
 ?>
 ===DONE===
 --EXPECTF--
@@ -45,6 +45,6 @@ bool(false)
 Warning: ldap_set_rebind_proc() expects exactly 2 parameters, 3 given in %s on line %d
 bool(false)
 
-Warning: ldap_set_rebind_proc(): Two arguments expected for 'rebind_proc_inexistant' to be a valid callback in %s on line %d
+Warning: ldap_set_rebind_proc(): Two arguments expected for 'rebind_proc_inexistent' to be a valid callback in %s on line %d
 bool(false)
 ===DONE===
diff --git a/ext/libxml/tests/bug61367-read.phpt b/ext/libxml/tests/bug61367-read.phpt
index 94da3d848..75d0006a3 100644
--- a/ext/libxml/tests/bug61367-read.phpt
+++ b/ext/libxml/tests/bug61367-read.phpt
@@ -8,7 +8,7 @@ error_reporting=E_ALL & ~E_NOTICE
 --FILE--
 <?php
 /*
- * Note: Using error_reporting=E_ALL & ~E_NOTICE to supress "Trying to get property of non-object" notices.
+ * Note: Using error_reporting=E_ALL & ~E_NOTICE to suppress "Trying to get property of non-object" notices.
  */
 class StreamExploiter {
 	public function stream_close (  ) {
diff --git a/ext/mbstring/README_PHP3-i18n-ja b/ext/mbstring/README_PHP3-i18n-ja
index cac00b82a..869fe3e49 100644
--- a/ext/mbstring/README_PHP3-i18n-ja
+++ b/ext/mbstring/README_PHP3-i18n-ja
@@ -408,7 +408,7 @@ o i18n.script_encoding - script encoding
     entering the script parser.
 
     Be aware that auto detection may fail under some conditions.
-    For best auto detection, add multibyte charactor at begining of
+    For best auto detection, add multibyte charactor at beginning of
     script.
 
 
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8.c
index fcee61053..553970034 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_utf8.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8.c
@@ -79,7 +79,7 @@ const struct mbfl_convert_vtbl vtbl_utf8_wchar = {
 	mbfl_filt_conv_common_ctor,
 	mbfl_filt_conv_common_dtor,
 	mbfl_filt_conv_utf8_wchar,
-	mbfl_filt_conv_common_flush
+	mbfl_filt_conv_utf8_wchar_flush
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_utf8 = {
@@ -93,6 +93,17 @@ const struct mbfl_convert_vtbl vtbl_wchar_utf8 = {
 
 #define CK(statement)	do { if ((statement) < 0) return (-1); } while (0)
 
+int mbfl_filt_put_invalid_char(int c, mbfl_convert_filter *filter)
+{
+	int w;
+	w = c & MBFL_WCSGROUP_MASK;
+	w |= MBFL_WCSGROUP_THROUGH;
+	filter->status = 0;
+	filter->cache = 0;
+	CK((*filter->output_function)(w, filter->data));
+}
+
+
 /*
  * UTF-8 => wchar
  */
@@ -100,111 +111,104 @@ int mbfl_filt_conv_utf8_wchar(int c, mbfl_convert_filter *filter)
 {
 	int s, c1, w = 0, flag = 0;
 
-	if (c < 0x80) {
-		if (filter->status != 0)  {
-			w = (filter->cache & MBFL_WCSGROUP_MASK) | MBFL_WCSGROUP_THROUGH;
-			CK((*filter->output_function)(w, filter->data));
-			filter->status = 0;
-			filter->cache = 0;
-		}
-		if (c >= 0) {
+retry:
+	switch (filter->status & 0xff) {
+	case 0x00:
+		if (c < 0x80) {
 			CK((*filter->output_function)(c, filter->data));
+		} else if (c >= 0xc2 && c <= 0xdf) { /* 2byte code first char: 0xc2-0xdf */
+			filter->status = 0x10;
+			filter->cache = c & 0x1f;
+		} else if (c >= 0xe0 && c <= 0xef) { /* 3byte code first char: 0xe0-0xef */
+			filter->status = 0x20;
+			filter->cache = c & 0xf;
+		} else if (c >= 0xf0 && c <= 0xf4) { /* 3byte code first char: 0xf0-0xf4 */
+			filter->status = 0x30;
+			filter->cache = c & 0x7;
+		} else {
+			mbfl_filt_put_invalid_char(c, filter);
 		}
-	} else if (c < 0xc0) {
-		int status = filter->status & 0xff;
-		switch (status) {
-		case 0x10: /* 2byte code 2nd char: 0x80-0xbf */
-		case 0x21: /* 3byte code 3rd char: 0x80-0xbf */
-		case 0x32: /* 4byte code 4th char: 0x80-0xbf */
-			filter->status = 0;
-			s = filter->cache | (c & 0x3f);
+		break;
+	case 0x10: /* 2byte code 2nd char: 0x80-0xbf */
+	case 0x21: /* 3byte code 3rd char: 0x80-0xbf */
+	case 0x32: /* 4byte code 4th char: 0x80-0xbf */
+		filter->status = 0;
+		if (c >= 0x80 && c <= 0xbf) {
+			s = (filter->cache<<6) | (c & 0x3f);			
 			filter->cache = 0;
-			if ((status == 0x10 && s >= 0x80) ||
-			    (status == 0x21 && s >= 0x800 && (s < 0xd800 || s > 0xdfff)) ||
-			    (status == 0x32 && s >= 0x10000 && s < 0x110000)) {
-				CK((*filter->output_function)(s, filter->data));
-			} else {
-				w = s & MBFL_WCSGROUP_MASK;
-				flag = 1;
-			}
-			break;
-		case 0x20: /* 3byte code 2nd char: 0:0xa0-0xbf,D:0x80-9F,1-C,E-F:0x80-0x9f */
-			s = filter->cache | ((c & 0x3f) << 6);
-			c1 = (s >> 12) & 0xf;
-			if ((c1 == 0x0 && c >= 0xa0) || 
-				(c1 == 0xd && c < 0xa0) || 
-				(c1 > 0x0 && c1 != 0xd)) {
-				filter->cache = s;
-				filter->status++;
-			} else {
-				w = s & MBFL_WCSGROUP_MASK;
-				flag = 1;
-			}
-			break;
-		case 0x31: /* 4byte code 3rd char: 0x80-0xbf */
-			filter->cache |= ((c & 0x3f) << 6);
-			filter->status++;
-			break;
-		case 0x30: /* 4byte code 2nd char: 0:0x90-0xbf,1-3:0x80-0xbf,4:0x80-0x8f */
-			s = filter->cache | ((c & 0x3f) << 12);
-			c1 = (s >> 18) & 0x7;
-			if ((c1 == 0x0 && c >= 0x90) ||
-				(c1 > 0x0 && c1 < 0x4) ||
-				(c1 == 0x4 && c < 0x90)) {
-				filter->cache = s;
-				filter->status++;
-			} else {
-				w = s & MBFL_WCSGROUP_MASK;
-				flag = 1;
-			}
-			break;
-		default:
-			w = c & MBFL_WCSGROUP_MASK;
-			flag = 1;
-			break;
+			CK((*filter->output_function)(s, filter->data));			
+		} else {
+			mbfl_filt_put_invalid_char(filter->cache, filter);
+			goto retry;			
 		}
-	} else if (c < 0xc2) { /* invalid: 0xc0,0xc1 */
-		w = c & MBFL_WCSGROUP_MASK;
-		flag = 1;
-	} else if (c < 0xe0) { /* 2byte code first char: 0xc2-0xdf */
-		if (filter->status == 0x0) {
-			filter->status = 0x10;
-			filter->cache = (c & 0x1f) << 6;
+		break;
+	case 0x20: /* 3byte code 2nd char: 0:0xa0-0xbf,D:0x80-9F,1-C,E-F:0x80-0x9f */
+		s = (filter->cache<<6) | (c & 0x3f);
+		c1 = filter->cache & 0xf;
+		
+		if ((c >= 0x80 && c <= 0xbf) &&
+			((c1 == 0x0 && c >= 0xa0) ||
+			 (c1 == 0xd && c < 0xa0) ||
+			 (c1 > 0x0 && c1 != 0xd))) {
+			filter->cache = s;
+			filter->status++;
 		} else {
-			w = c & MBFL_WCSGROUP_MASK;
-			flag = 1;
+			mbfl_filt_put_invalid_char(filter->cache, filter);
+			goto retry;						
 		}
-	} else if (c < 0xf0) { /* 3byte code first char: 0xe0-0xef */
-		if (filter->status == 0x0) {
-			filter->status = 0x20;
-			filter->cache = (c & 0xf) << 12;
+		break;
+	case 0x30: /* 4byte code 2nd char: 0:0x90-0xbf,1-3:0x80-0xbf,4:0x80-0x8f */
+		s = (filter->cache<<6) | (c & 0x3f);
+		c1 = filter->cache & 0x7;
+		
+		if ((c >= 0x80 && c <= 0xbf) &&
+			((c1 == 0x0 && c >= 0x90) ||
+			 (c1 == 0x4 && c < 0x90) ||
+			 (c1 > 0x0 && c1 != 0x4))) {
+			filter->cache = s;
+			filter->status++;
 		} else {
-			w = c & MBFL_WCSGROUP_MASK;
-			flag = 1;
+			mbfl_filt_put_invalid_char(filter->cache, filter);
+			goto retry;						
 		}
-	} else if (c < 0xf5) { /* 4byte code first char: 0xf0-0xf4 */
-		if (filter->status == 0x0) {
-			filter->status = 0x30;
-			filter->cache = (c & 0x7) << 18;
+		break;
+	case 0x31: /* 4byte code 3rd char: 0x80-0xbf */
+		if (c >= 0x80 && c <= 0xbf) {
+			filter->cache = (filter->cache<<6) | (c & 0x3f);
+			filter->status++;
 		} else {
-			w = c & MBFL_WCSGROUP_MASK;
-			flag = 1;
+			mbfl_filt_put_invalid_char(filter->cache, filter);
+			goto retry;						
 		}
-	} else {
-		w = c & MBFL_WCSGROUP_MASK;
-		flag = 1;
-	}
-
-	if (flag) {
-		w |= MBFL_WCSGROUP_THROUGH;
-		CK((*filter->output_function)(w, filter->data));
+		break;
+	default:
 		filter->status = 0;
-		filter->cache = 0;
+		break;
 	}
 
 	return c;
 }
 
+int mbfl_filt_conv_utf8_wchar_flush(mbfl_convert_filter *filter)
+{
+	int status, cache;
+
+	status = filter->status;
+	cache = filter->cache;
+
+	filter->status = 0;
+	filter->cache = 0;
+
+	if (status != 0) {
+		mbfl_filt_put_invalid_char(cache, filter);
+	}
+
+	if (filter->flush_function != NULL) {
+		(*filter->flush_function)(filter->data);
+	}
+	return 0;
+}
+
 /*
  * wchar => UTF-8
  */
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8.h b/ext/mbstring/libmbfl/filters/mbfilter_utf8.h
index 07bf65502..970ace646 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_utf8.h
+++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8.h
@@ -37,5 +37,6 @@ extern const struct mbfl_convert_vtbl vtbl_wchar_utf8;
 
 int mbfl_filt_conv_utf8_wchar(int c, mbfl_convert_filter *filter);
 int mbfl_filt_conv_wchar_utf8(int c, mbfl_convert_filter *filter);
+int mbfl_filt_conv_utf8_wchar_flush(mbfl_convert_filter *filter);
 
 #endif /* MBFL_MBFILTER_UTF8_H */
diff --git a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
index 62feca40b..f9b643c17 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
@@ -37,6 +37,7 @@
 #include "mbfilter_sjis_mobile.h"
 
 extern int mbfl_filt_ident_utf8(int c, mbfl_identify_filter *filter);
+extern int mbfl_filt_conv_utf8_wchar_flush(mbfl_convert_filter *filter);
 
 extern const unsigned char mblen_table_utf8[];
 
@@ -115,7 +116,7 @@ const struct mbfl_convert_vtbl vtbl_utf8_docomo_wchar = {
 	mbfl_filt_conv_common_ctor,
 	mbfl_filt_conv_common_dtor,
 	mbfl_filt_conv_utf8_mobile_wchar,
-	mbfl_filt_conv_common_flush
+	mbfl_filt_conv_utf8_wchar_flush
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_utf8_docomo = {
@@ -133,7 +134,7 @@ const struct mbfl_convert_vtbl vtbl_utf8_kddi_a_wchar = {
 	mbfl_filt_conv_common_ctor,
 	mbfl_filt_conv_common_dtor,
 	mbfl_filt_conv_utf8_mobile_wchar,
-	mbfl_filt_conv_common_flush
+	mbfl_filt_conv_utf8_wchar_flush
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_utf8_kddi_a = {
@@ -151,7 +152,7 @@ const struct mbfl_convert_vtbl vtbl_utf8_kddi_b_wchar = {
 	mbfl_filt_conv_common_ctor,
 	mbfl_filt_conv_common_dtor,
 	mbfl_filt_conv_utf8_mobile_wchar,
-	mbfl_filt_conv_common_flush
+	mbfl_filt_conv_utf8_wchar_flush
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_utf8_kddi_b = {
@@ -169,7 +170,7 @@ const struct mbfl_convert_vtbl vtbl_utf8_sb_wchar = {
 	mbfl_filt_conv_common_ctor,
 	mbfl_filt_conv_common_dtor,
 	mbfl_filt_conv_utf8_mobile_wchar,
-	mbfl_filt_conv_common_flush
+	mbfl_filt_conv_utf8_wchar_flush
 };
 
 const struct mbfl_convert_vtbl vtbl_wchar_utf8_sb = {
@@ -191,119 +192,97 @@ int mbfl_filt_conv_utf8_mobile_wchar(int c, mbfl_convert_filter *filter)
 	int s, w = 0, flag = 0;
 	int s1 = 0, c1 = 0, snd = 0;
 
-	if (c < 0x80) {
-		if (c >= 0) {
+retry:
+	switch (filter->status & 0xff) {
+	case 0x00:
+		if (c < 0x80) {
 			CK((*filter->output_function)(c, filter->data));
+		} else if (c >= 0xc2 && c <= 0xdf) { /* 2byte code first char: 0xc2-0xdf */
+			filter->status = 0x10;
+			filter->cache = c & 0x1f;
+		} else if (c >= 0xe0 && c <= 0xef) { /* 3byte code first char: 0xe0-0xef */
+			filter->status = 0x20;
+			filter->cache = c & 0xf;
+		} else if (c >= 0xf0 && c <= 0xf4) { /* 3byte code first char: 0xf0-0xf4 */
+			filter->status = 0x30;
+			filter->cache = c & 0x7;
+		} else {
+			mbfl_filt_put_invalid_char(c, filter);
 		}
+		break;
+	case 0x10: /* 2byte code 2nd char: 0x80-0xbf */
+	case 0x21: /* 3byte code 3rd char: 0x80-0xbf */
+	case 0x32: /* 4byte code 4th char: 0x80-0xbf */
 		filter->status = 0;
-	} else if (c < 0xc0) {
-		int status = filter->status & 0xff;
-		switch (status) {
-		case 0x10: /* 2byte code 2nd char: 0x80-0xbf */
-		case 0x21: /* 3byte code 3rd char: 0x80-0xbf */
-		case 0x32: /* 4byte code 4th char: 0x80-0xbf */
-			filter->status = 0;
-			s = filter->cache | (c & 0x3f);
+		if (c >= 0x80 && c <= 0xbf) {
+			s = (filter->cache<<6) | (c & 0x3f);			
 			filter->cache = 0;
-			if ((status == 0x10 && s >= 0x80) ||
-			    (status == 0x21 && s >= 0x800 && (s < 0xd800 || s > 0xdfff)) ||
-			    (status == 0x32 && s >= 0x10000 && s < 0x110000)) {
-				
-				if (filter->from->no_encoding == mbfl_no_encoding_utf8_docomo &&
-					mbfilter_conv_r_map_tbl(s, &s1, mbfl_docomo2uni_pua, 4) > 0) {
-					s = mbfilter_sjis_emoji_docomo2unicode(s1, &snd);
-				} else if (filter->from->no_encoding == mbfl_no_encoding_utf8_kddi_a &&
-						   mbfilter_conv_r_map_tbl(s, &s1, mbfl_kddi2uni_pua, 7) > 0) {
-					s = mbfilter_sjis_emoji_kddi2unicode(s1, &snd);
-				} else if (filter->from->no_encoding == mbfl_no_encoding_utf8_kddi_b &&
-						   mbfilter_conv_r_map_tbl(s, &s1, mbfl_kddi2uni_pua_b, 8) > 0) {
-					s = mbfilter_sjis_emoji_kddi2unicode(s1, &snd);
-				} else if (filter->from->no_encoding == mbfl_no_encoding_utf8_sb &&
-						   mbfilter_conv_r_map_tbl(s, &s1, mbfl_sb2uni_pua, 6) > 0) {
-					s = mbfilter_sjis_emoji_sb2unicode(s1, &snd);
-				}
-
-				if (snd > 0) {
-					CK((*filter->output_function)(snd, filter->data));
-				}
-				CK((*filter->output_function)(s, filter->data));
-			} else {
-				w = s & MBFL_WCSGROUP_MASK;
-				flag = 1;
-			}
-			break;
-		case 0x20: /* 3byte code 2nd char: 0:0xa0-0xbf,D:0x80-9F,1-C,E-F:0x80-0x9f */
-			s = filter->cache | ((c & 0x3f) << 6);
-			c1 = (s >> 12) & 0xf;
-			if ((c1 == 0x0 && c >= 0xa0) || 
-				(c1 == 0xd && c < 0xa0) || 
-				(c1 > 0x0 && c1 != 0xd)) {
-				filter->cache = s;
-				filter->status++;
-			} else {
-				w = s & MBFL_WCSGROUP_MASK;
-				flag = 1;
+
+			if (filter->from->no_encoding == mbfl_no_encoding_utf8_docomo &&
+				mbfilter_conv_r_map_tbl(s, &s1, mbfl_docomo2uni_pua, 4) > 0) {
+				s = mbfilter_sjis_emoji_docomo2unicode(s1, &snd);
+			} else if (filter->from->no_encoding == mbfl_no_encoding_utf8_kddi_a &&
+					   mbfilter_conv_r_map_tbl(s, &s1, mbfl_kddi2uni_pua, 7) > 0) {
+				s = mbfilter_sjis_emoji_kddi2unicode(s1, &snd);
+			} else if (filter->from->no_encoding == mbfl_no_encoding_utf8_kddi_b &&
+					   mbfilter_conv_r_map_tbl(s, &s1, mbfl_kddi2uni_pua_b, 8) > 0) {
+				s = mbfilter_sjis_emoji_kddi2unicode(s1, &snd);
+			} else if (filter->from->no_encoding == mbfl_no_encoding_utf8_sb &&
+					   mbfilter_conv_r_map_tbl(s, &s1, mbfl_sb2uni_pua, 6) > 0) {
+				s = mbfilter_sjis_emoji_sb2unicode(s1, &snd);
 			}
-			break;
-		case 0x31: /* 4byte code 3rd char: 0x80-0xbf */
-			filter->cache |= ((c & 0x3f) << 6);
-			filter->status++;
-			break;
-		case 0x30: /* 4byte code 2nd char: 0:0x90-0xbf,1-3:0x80-0xbf,4:0x80-0x8f */
-			s = filter->cache | ((c & 0x3f) << 12);
-			c1 = (s >> 18) & 0x7;
-			if ((c1 == 0x0 && c >= 0x90) ||
-				(c1 > 0x0 && c1 < 0x4) ||
-				(c1 == 0x4 && c < 0x90)) {
-				filter->cache = s;
-				filter->status++;
-			} else {
-				w = s & MBFL_WCSGROUP_MASK;
-				flag = 1;
+			
+			if (snd > 0) {
+				CK((*filter->output_function)(snd, filter->data));
 			}
-			break;
-		default:
-			w = c & MBFL_WCSGROUP_MASK;
-			flag = 1;
-			break;
+			CK((*filter->output_function)(s, filter->data));
+		} else {
+			mbfl_filt_put_invalid_char(filter->cache, filter);
+			goto retry;			
 		}
-	} else if (c < 0xc2) { /* invalid: 0xc0,0xc1 */
-		w = c & MBFL_WCSGROUP_MASK;
-		flag = 1;
-	} else if (c < 0xe0) { /* 2byte code first char: 0xc2-0xdf */
-		if (filter->status == 0x0) {
-			filter->status = 0x10;
-			filter->cache = (c & 0x1f) << 6;
+		break;
+	case 0x20: /* 3byte code 2nd char: 0:0xa0-0xbf,D:0x80-9F,1-C,E-F:0x80-0x9f */
+		s = (filter->cache<<6) | (c & 0x3f);
+		c1 = filter->cache & 0xf;
+		
+		if ((c >= 0x80 && c <= 0xbf) &&
+			((c1 == 0x0 && c >= 0xa0) ||
+			 (c1 == 0xd && c < 0xa0) ||
+			 (c1 > 0x0 && c1 != 0xd))) {
+			filter->cache = s;
+			filter->status++;
 		} else {
-			w = c & MBFL_WCSGROUP_MASK;
-			flag = 1;
+			mbfl_filt_put_invalid_char(filter->cache, filter);
+			goto retry;						
 		}
-	} else if (c < 0xf0) { /* 3byte code first char: 0xe0-0xef */
-		if (filter->status == 0x0) {
-			filter->status = 0x20;
-			filter->cache = (c & 0xf) << 12;
+		break;
+	case 0x30: /* 4byte code 2nd char: 0:0x90-0xbf,1-3:0x80-0xbf,4:0x80-0x8f */
+		s = (filter->cache<<6) | (c & 0x3f);
+		c1 = filter->cache & 0x7;
+		
+		if ((c >= 0x80 && c <= 0xbf) &&
+			((c1 == 0x0 && c >= 0x90) ||
+			 (c1 == 0x4 && c < 0x90) ||
+			 (c1 > 0x0 && c1 != 0x4))) {
+			filter->cache = s;
+			filter->status++;
 		} else {
-			w = c & MBFL_WCSGROUP_MASK;
-			flag = 1;
+			mbfl_filt_put_invalid_char(filter->cache, filter);
+			goto retry;						
 		}
-	} else if (c < 0xf5) { /* 4byte code first char: 0xf0-0xf4 */
-		if (filter->status == 0x0) {
-			filter->status = 0x30;
-			filter->cache = (c & 0x7) << 18;
+		break;
+	case 0x31: /* 4byte code 3rd char: 0x80-0xbf */
+		if (c >= 0x80 && c <= 0xbf) {
+			filter->cache = (filter->cache<<6) | (c & 0x3f);
+			filter->status++;
 		} else {
-			w = c & MBFL_WCSGROUP_MASK;
-			flag = 1;
+			mbfl_filt_put_invalid_char(filter->cache, filter);
+			goto retry;						
 		}
-	} else {
-		w = c & MBFL_WCSGROUP_MASK;
-		flag = 1;
-	}
-
-	if (flag) {
-		w |= MBFL_WCSGROUP_THROUGH;
-		CK((*filter->output_function)(w, filter->data));
+		break;
+	default:
 		filter->status = 0;
-		filter->cache = 0;
+		break;
 	}
 
 	return c;
diff --git a/ext/mbstring/libmbfl/filters/unicode_table_jis2004.h b/ext/mbstring/libmbfl/filters/unicode_table_jis2004.h
index 5ae282e91..cb6c445e7 100644
--- a/ext/mbstring/libmbfl/filters/unicode_table_jis2004.h
+++ b/ext/mbstring/libmbfl/filters/unicode_table_jis2004.h
@@ -4643,7 +4643,7 @@ static const int ucs_r2_jisx0213_min = 0xFA0F;
 static const int ucs_r2_jisx0213_max = 0xFA6A;
 
 /* 
-   CJK Compatibility Ideographs: U+F900 - U+FAFF (seperate mapping for U+F9XX)
+   CJK Compatibility Ideographs: U+F900 - U+FAFF (separate mapping for U+F9XX)
 */
 static const unsigned short ucs_r2b_jisx0213_cmap_key[] = {
 	0xf91d,0xf928,0xf929,0xf936,0xf970,0xf9d0,0xf9dc};
diff --git a/ext/mbstring/oniguruma/HISTORY b/ext/mbstring/oniguruma/HISTORY
index a1debefa4..647a46090 100644
--- a/ext/mbstring/oniguruma/HISTORY
+++ b/ext/mbstring/oniguruma/HISTORY
@@ -673,7 +673,7 @@ History
 2004/10/18: [impl] (thanks Imai Yasumasa)
                    enclose #include <sys/types.h> by #ifndef __BORLANDC__.
 2004/10/18: [bug]  (thanks Imai Yasumasa)
-                   memory acess violation in select_opt_exact_info().
+                   memory access violation in select_opt_exact_info().
 2004/09/25: [dist] fix doc/API and doc/API.ja.
 2004/09/25: [bug]  fix OP_SEMI_END_BUF process in match_at() for
                    the case USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE
@@ -1607,7 +1607,7 @@ History
 2003/01/31: [impl] rename TTRANS() to TOLOWER().
 2003/01/30: [bug]  .c.o --> .c.obj in win32\Makefile.
 2003/01/30: [impl] add -DNOT_RUBY to Makefile.in.
-                   NOT_RUBY is refered in regint.h for escape double
+                   NOT_RUBY is referred in regint.h for escape double
                    including config.h.
 2003/01/30: [impl] when string hasn't case ambiguity, don't compile
                    to ignore case opcode.
diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
index 145ee0c13..607921ebb 100644
--- a/ext/mbstring/php_mbregex.c
+++ b/ext/mbstring/php_mbregex.c
@@ -648,7 +648,7 @@ _php_mb_regex_init_options(const char *parg, int narg, OnigOptionType *option, O
 /* }}} */
 
 /*
- * php funcions
+ * php functions
  */
 
 /* {{{ proto string mb_regex_encoding([string encoding])
diff --git a/ext/mbstring/tests/bug65045.phpt b/ext/mbstring/tests/bug65045.phpt
new file mode 100644
index 000000000..03a090ded
--- /dev/null
+++ b/ext/mbstring/tests/bug65045.phpt
@@ -0,0 +1,29 @@
+--TEST--
+Bug #65045: mb_convert_encoding breaks well-formed character
+--SKIPIF--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+--FILE--
+<?php
+
+//declare(encoding = 'UTF-8');
+mb_internal_encoding('UTF-8');
+
+$str = "\xF0\xA4\xAD".  "\xF0\xA4\xAD\xA2"."\xF0\xA4\xAD\xA2";
+$expected = "\xEF\xBF\xBD"."\xF0\xA4\xAD\xA2"."\xF0\xA4\xAD\xA2";
+
+$str2 = "\xF0\xA4\xAD\xA2"."\xF0\xA4\xAD\xA2"."\xF0\xA4\xAD";
+$expected2 = "\xF0\xA4\xAD\xA2"."\xF0\xA4\xAD\xA2"."\xEF\xBF\xBD";
+
+mb_substitute_character(0xFFFD);
+var_dump(
+    $expected === htmlspecialchars_decode(htmlspecialchars($str, ENT_SUBSTITUTE, 'UTF-8')),
+    $expected2 === htmlspecialchars_decode(htmlspecialchars($str2, ENT_SUBSTITUTE, 'UTF-8')), 
+    $expected === mb_convert_encoding($str, 'UTF-8', 'UTF-8'),
+    $expected2 === mb_convert_encoding($str2, 'UTF-8', 'UTF-8')
+);
+
+--EXPECT--
+bool(true)
+bool(true)
+bool(true)
+bool(true)
\ No newline at end of file
diff --git a/ext/mbstring/tests/illformed_utf_sequences.phpt b/ext/mbstring/tests/illformed_utf_sequences.phpt
index b5b9d94db..378b956d6 100644
--- a/ext/mbstring/tests/illformed_utf_sequences.phpt
+++ b/ext/mbstring/tests/illformed_utf_sequences.phpt
@@ -25,28 +25,28 @@ var_dump(chk_enc("\x31\x32\x33", 0));
 var_dump(chk_enc("\x41\x42\x43", 0));
 var_dump(chk_enc("\xc0\xb1\xc0\xb2\xc0\xb3", 6));
 var_dump(chk_enc("\xc1\x81\xc1\x82\xc1\x83", 6));
-var_dump(chk_enc("\xe0\x80\xb1\xe0\x80\xb2\xe0\x80\xb3", 6));
-var_dump(chk_enc("\xe0\x81\x81\xe0\x81\x82\xe0\x81\x83", 6));
-var_dump(chk_enc("\xf0\x80\x80\xb1\xf0\x80\x80\xb2\xf0\x80\x80\xb3", 9));
-var_dump(chk_enc("\xf0\x80\x81\x81\xf0\x80\x81\x82\xf0\x81\x83", 8));
+var_dump(chk_enc("\xe0\x80\xb1\xe0\x80\xb2\xe0\x80\xb3", 9));
+var_dump(chk_enc("\xe0\x81\x81\xe0\x81\x82\xe0\x81\x83", 9));
+var_dump(chk_enc("\xf0\x80\x80\xb1\xf0\x80\x80\xb2\xf0\x80\x80\xb3", 12));
+var_dump(chk_enc("\xf0\x80\x81\x81\xf0\x80\x81\x82\xf0\x81\x83", 11));
 var_dump(chk_enc("\xf8\x80\x80\x80\xb1\xf8\x80\x80\x80\xb2\xf8\x80\x80\x80\xb3", 15));
 var_dump(chk_enc("\xf8\x80\x80\x81\x81\xf8\x80\x80\x81\x82\xf8\x80\x80\x81\x83", 15));
 var_dump(chk_enc("\xfc\x80\x80\x80\x80\xb1\xfc\x80\x80\x80\x80\xb2\xfc\x80\x80\x80\x80\xb3", 18));
 var_dump(chk_enc("\xfc\x80\x80\x80\x81\x81\xfc\x80\x80\x80\x81\x82\xfc\x80\x80\x80\x81\x83", 18));
 
 var_dump(chk_enc("\xc2\xa2\xc2\xa3\xc2\xa5", 0));
-var_dump(chk_enc("\xe0\x82\xa2\xe0\x82\xa3\xe0\x82\xa5", 6));
-var_dump(chk_enc("\xf0\x80\x82\xa2\xf0\x80\x82\xa3\xf0\x80\x82\xa5", 9));
+var_dump(chk_enc("\xe0\x82\xa2\xe0\x82\xa3\xe0\x82\xa5", 9));
+var_dump(chk_enc("\xf0\x80\x82\xa2\xf0\x80\x82\xa3\xf0\x80\x82\xa5", 12));
 var_dump(chk_enc("\xf8\x80\x80\x82\xa2\xf8\x80\x80\x82\xa3\xf8\x80\x80\x82\xa5", 15));
 var_dump(chk_enc("\xfc\x80\x80\x80\x82\xa2\xfc\x80\x80\x80\x82\xa3\xfc\x80\x80\x80\x82\xa5", 18));
 
 var_dump(chk_enc("\xc1\xbf", 2));
 var_dump(chk_enc("\xc2\x80", 0));
 var_dump(chk_enc("\xdf\xbf", 0));
-var_dump(chk_enc("\xe0\x9f\xff", 2));
+var_dump(chk_enc("\xe0\x9f\xff", 3));
 var_dump(chk_enc("\xe0\xa0\x80", 2));
 var_dump(chk_enc("\xef\xbf\xbf", 0));
-var_dump(chk_enc("\xf0\x8f\xbf\xbf", 3));
+var_dump(chk_enc("\xf0\x8f\xbf\xbf", 4));
 var_dump(chk_enc("\xf0\x90\x80\x80", 0));
 var_dump(chk_enc("\xf7\xbf\xbf\xbf", 4));
 var_dump(chk_enc("\xf8\x87\xbf\xbf\xbf", 5));
@@ -61,7 +61,7 @@ echo "UTF-8 and surrogates area\n";
 $out = '';
 $cnt = 0;
 for ($i = 0xd7ff; $i <= 0xe000; ++$i) {
-	$s = chk_enc(pack('C3', 0xe0 | ($i >> 12), 0x80 | ($i >> 6) & 0x3f, 0x80 | $i & 0x3f), 2);
+	$s = chk_enc(pack('C3', 0xe0 | ($i >> 12), 0x80 | ($i >> 6) & 0x3f, 0x80 | $i & 0x3f), 3);
 	if ($s === false) {
 		$cnt++;
 	} else {
diff --git a/ext/mbstring/tests/mb_http_output.phpt b/ext/mbstring/tests/mb_http_output.phpt
index 7fb3335fe..6f149bfc9 100644
--- a/ext/mbstring/tests/mb_http_output.phpt
+++ b/ext/mbstring/tests/mb_http_output.phpt
@@ -4,7 +4,7 @@ mb_http_output()
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
-//TODO: Add more encoding. Wrong paramter type test.
+//TODO: Add more encoding. Wrong parameter type test.
 //$debug = true;
 ini_set('include_path', dirname(__FILE__));
 include_once('common.inc');
diff --git a/ext/mbstring/tests/mb_str_functions_opt-parameter.phpt b/ext/mbstring/tests/mb_str_functions_opt-parameter.phpt
index 5fb642f9b..6219e585e 100644
--- a/ext/mbstring/tests/mb_str_functions_opt-parameter.phpt
+++ b/ext/mbstring/tests/mb_str_functions_opt-parameter.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Optional long parameter might be null
+--SKIPIF--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
 <?php
 echo mb_strpos('abb', 'b', null, 'UTF-8') . "\n";
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index 5968c4334..998323d7c 100644
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -45,7 +45,7 @@ PHP_ARG_WITH(mysql, for MySQL support,
                           mysqlnd the MySQL native driver will be used])
 
 PHP_ARG_WITH(mysql-sock, for specified location of the MySQL UNIX socket,
-[  --with-mysql-sock[=DIR]   MySQL/MySQLi/PDO_MYSQL: Location of the MySQL unix socket pointer.
+[  --with-mysql-sock[=SOCKPATH]   MySQL/MySQLi/PDO_MYSQL: Location of the MySQL unix socket pointer.
                             If unspecified, the default locations are searched], no, no)
 
 if test -z "$PHP_ZLIB_DIR"; then
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 5ad7bc903..078b402ff 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -296,7 +296,7 @@ static const zend_function_entry mysql_functions[] = {
 #ifdef MYSQL_HAS_SET_CHARSET
 	PHP_FE(mysql_set_charset,							arginfo_mysql_set_charset)
 #endif
-	/* for downwards compatability */
+	/* for downwards compatibility */
 	PHP_FALIAS(mysql,				mysql_db_query,		arginfo_mysql_db_query)
 	PHP_FALIAS(mysql_fieldname,		mysql_field_name,	arginfo_mysql_field_name)
 	PHP_FALIAS(mysql_fieldtable,	mysql_field_table,	arginfo_mysql_field_seek)
@@ -720,7 +720,7 @@ PHP_MINFO_FUNCTION(mysql)
 static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 {
 	char *user=NULL, *passwd=NULL, *host_and_port=NULL, *socket=NULL, *tmp=NULL, *host=NULL;
-	int  user_len, passwd_len, host_len;
+	int  user_len = 0, passwd_len = 0, host_len = 0;
 	char *hashed_details=NULL;
 	int hashed_details_length, port = MYSQL_PORT;
 	long client_flags = 0;
@@ -1918,7 +1918,7 @@ PHP_FUNCTION(mysql_result)
 
 /*
 johannes TODO:
-Do 2 zend_parse_paramters calls instead of type "z" and switch below
+Do 2 zend_parse_parameters calls instead of type "z" and switch below
 Q: String or long first?
 */
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|z", &result, &row, &field) == FAILURE) {
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index a4c1b874f..2710b9de2 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -531,7 +531,7 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry *class_
 #include "ext/mysqlnd/mysqlnd_reverse_api.h"
 static MYSQLND *mysqli_convert_zv_to_mysqlnd(zval * zv TSRMLS_DC)
 {
-	if (Z_TYPE_P(zv) == IS_OBJECT && Z_OBJCE_P(zv) == mysqli_link_class_entry) {
+	if (Z_TYPE_P(zv) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zv), mysqli_link_class_entry TSRMLS_CC)) {
 		MY_MYSQL * mysql;
 		MYSQLI_RESOURCE  * my_res;
 		mysqli_object * intern = (mysqli_object *)zend_object_store_get_object(zv TSRMLS_CC);
@@ -1257,7 +1257,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags
 
 	php_mysqli_fetch_into_hash_aux(return_value, result, fetchtype TSRMLS_CC);
 
-	if (into_object && Z_TYPE_P(return_value) != IS_NULL) {
+	if (into_object && Z_TYPE_P(return_value) == IS_ARRAY) {
 		zval dataset = *return_value;
 		zend_fcall_info fci;
 		zend_fcall_info_cache fcc;
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index 2ad1a2040..e1557efce 100644
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -564,7 +564,7 @@ PHP_FUNCTION(mysqli_query)
 	MY_MYSQL			*mysql;
 	zval				*mysql_link;
 	MYSQLI_RESOURCE		*mysqli_resource;
-	MYSQL_RES 			*result;
+	MYSQL_RES 			*result = NULL;
 	char				*query = NULL;
 	int 				query_len;
 	long 				resultmode = MYSQLI_STORE_RESULT;
@@ -835,7 +835,7 @@ PHP_FUNCTION(mysqli_reap_async_query)
 	MY_MYSQL		*mysql;
 	zval			*mysql_link;
 	MYSQLI_RESOURCE		*mysqli_resource;
-	MYSQL_RES 			*result;
+	MYSQL_RES 			*result = NULL;
 
 	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
 		return;
diff --git a/ext/mysqli/tests/bug34810.phpt b/ext/mysqli/tests/bug34810.phpt
index 1ea89d9be..4fe87f4c0 100644
--- a/ext/mysqli/tests/bug34810.phpt
+++ b/ext/mysqli/tests/bug34810.phpt
@@ -16,7 +16,7 @@ class DbConnection {
 		var_dump($link);
 
 		$link = mysqli_init();
-		/* @ is to supress 'Property access is not allowed yet' */
+		/* @ is to suppress 'Property access is not allowed yet' */
 		@var_dump($link);
 
 		$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
diff --git a/ext/mysqli/tests/bug64726.phpt b/ext/mysqli/tests/bug64726.phpt
new file mode 100644
index 000000000..8f24ad09b
--- /dev/null
+++ b/ext/mysqli/tests/bug64726.phpt
@@ -0,0 +1,23 @@
+--TEST--
+Bug #63398 (Segfault when calling fetch_object on a use_result and DB pointer has closed)
+--SKIPIF--
+<?php
+require_once('skipif.inc');
+require_once("connect.inc");
+if (!$IS_MYSQLND) {
+    die("skip mysqlnd only test");
+}
+require_once('skipifconnectfailure.inc');
+?>
+--FILE--
+<?php
+require 'connect.inc';
+$db = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
+
+$result = $db->query('SELECT 1', MYSQLI_USE_RESULT);
+$db->close();
+var_dump($result->fetch_object());
+?>
+--EXPECTF--
+Warning: mysqli_result::fetch_object(): Error while reading a row in %sbug64726.php on line %d
+bool(false)
diff --git a/ext/mysqli/tests/mysqli_driver.phpt b/ext/mysqli/tests/mysqli_driver.phpt
index 4e266a053..023e4d229 100644
--- a/ext/mysqli/tests/mysqli_driver.phpt
+++ b/ext/mysqli/tests/mysqli_driver.phpt
@@ -53,7 +53,7 @@ require_once('skipifconnectfailure.inc');
 	} catch (mysqli_sql_exception $e) {
 		$ok = true;
 		if ('' == $e->getMessage())
-			printf("[008] getMessage() has returned an emptry string.\n");
+			printf("[008] getMessage() has returned an empty string.\n");
 		if ('' == $e->getCode())
 			printf("[009] getCode() has returned an empty string.\n");
 		if ('' == $e->getFile())
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
index fa00ecda1..ac2e7c000 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
@@ -17,7 +17,7 @@ mysqli_fetch_assoc() - utf8
 		die("skip Looks like UTF8 is not available on the server");
 
 	if (strtolower($tmp['Charset']) !== 'utf8')
-		die("skip Not sure if UTF8 is available, cancelling the test");
+		die("skip Not sure if UTF8 is available, canceling the test");
 
 	mysqli_free_result($res);
 
@@ -28,7 +28,7 @@ mysqli_fetch_assoc() - utf8
 		die("skip Looks like UCS2 is not available on the server");
 
 	if (strtolower($tmp['Charset']) !== 'ucs2')
-		die("skip Not sure if UCS2 is available, cancelling the test");
+		die("skip Not sure if UCS2 is available, canceling the test");
 
 	mysqli_free_result($res);
 	mysqli_close($link);
diff --git a/ext/mysqli/tests/mysqli_get_client_stats.phpt b/ext/mysqli/tests/mysqli_get_client_stats.phpt
index ef5ef6ee6..a22fc58f5 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt
@@ -166,7 +166,7 @@ mysqlnd.collect_memory_statistics=1
 	mysqli_get_client_stats_assert_gt('bytes_sent', $info, $expected, $test_counter);
 	mysqli_get_client_stats_assert_gt('bytes_received', $info, $expected, $test_counter);
 
-	// real_data_* get incremeneted after mysqli_*fetch*()
+	// real_data_* get incremented after mysqli_*fetch*()
     mysqli_get_client_stats_assert_eq('bytes_received_real_data_normal', $info, "0", $test_counter);
 	mysqli_get_client_stats_assert_eq('bytes_received_real_data_ps', $info, "0", $test_counter);
 
diff --git a/ext/mysqli/tests/mysqli_options.phpt b/ext/mysqli/tests/mysqli_options.phpt
index 2f7986d3f..5daaa597f 100644
--- a/ext/mysqli/tests/mysqli_options.phpt
+++ b/ext/mysqli/tests/mysqli_options.phpt
@@ -12,7 +12,7 @@ require_once('skipifconnectfailure.inc');
 
 	$valid_options = array(
 		MYSQLI_READ_DEFAULT_GROUP 			=> "MYSQLI_READ_DEFAULT_GROUP",
-		MYSQLI_READ_DEFAULT_FILE 			=> "MYSQLI_READ_DEFAUTL_FILE",
+		MYSQLI_READ_DEFAULT_FILE 			=> "MYSQLI_READ_DEFAULT_FILE",
 		MYSQLI_OPT_CONNECT_TIMEOUT			=> "MYSQLI_OPT_CONNECT_TIMEOUT",
 		MYSQLI_OPT_LOCAL_INFILE				=> "MYSQLI_OPT_LOCAL_INFILE",
 		MYSQLI_INIT_COMMAND					=> "MYSQLI_INIT_COMMAND",
diff --git a/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt b/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt
new file mode 100644
index 000000000..d7a78f1cf
--- /dev/null
+++ b/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt
@@ -0,0 +1,50 @@
+--TEST--
+mysqli_stmt_prepare()
+--SKIPIF--
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?>
+--FILE--
+<?php
+	require_once("connect.inc");
+
+	// Note: No SQL tests here! We can expand one of the *fetch()
+	// tests to a generic SQL test, if we ever need that.
+	// We would duplicate the SQL test cases if we have it here and in one of the
+	// fetch tests, because the fetch tests would have to call prepare/execute etc.
+	// anyway.
+
+	$tmp    = NULL;
+	$link   = NULL;
+
+	require('table.inc');
+
+	$cleanupIds = range(1000, 3007);
+	$model = 50;
+
+	$params = '(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)';
+
+
+	/* create a prepared statement */
+	if ($stmt = $link->prepare("SHOW STATUS WHERE 1 = ? AND 1 IN {$params}")) {
+
+    	$stmt->bind_param('iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii', $model, $cleanupIds[0], $cleanupIds[1], $cleanupIds[2], $cleanupIds[3], $cleanupIds[4], $cleanupIds[5], $cleanupIds[6], $cleanupIds[7], $cleanupIds[8], $cleanupIds[9], $cleanupIds[10], $cleanupIds[11], $cleanupIds[12], $cleanupIds[13], $cleanupIds[14], $cleanupIds[15], $cleanupIds[16], $cleanupIds[17], $cleanupIds[18], $cleanupIds[19], $cleanupIds[20], $cleanupIds[21], $cleanupIds[22], $cleanupIds[23], $cleanupIds[24], $cleanupIds[25], $cleanupIds[26], $cleanupIds[27], $cleanupIds[28], $cleanupIds[29], $cleanupIds[30], $cleanupIds[31], $cleanupIds[32], $cleanupIds[33], $cleanupIds[34], $cleanupIds[35], $cleanupIds[36], $cleanupIds[37], $cleanupIds[38], $cleanupIds[39], $cleanupIds[40], $cleanupIds[41], $cleanupIds[42], $cleanupIds[43], $cleanupIds[44], $cleanupIds[45], $cleanupIds[46], $cleanupIds[47], $cleanupIds[48], $cleanupIds[49], $cleanupIds[50], $cleanupIds[51], $cleanupIds[52], $cleanupIds[53], $cleanupIds[54], $cleanupIds[55], $cleanupIds[56], $cleanupIds[57], $cleanupIds[58], $cleanupIds[59], $cleanupIds[60], $cleanupIds[61], $cleanupIds[62], $cleanupIds[63], $cleanupIds[64], $cleanupIds[65], $cleanupIds[66], $cleanupIds[67], $cleanupIds[68], $cleanupIds[69], $cleanupIds[70], $cleanupIds[71], $cleanupIds[72], $cleanupIds[73], $cleanupIds[74], $cleanupIds[75], $cleanupIds[76], $cleanupIds[77], $cleanupIds[78], $cleanupIds[79], $cleanupIds[80], $cleanupIds[81], $cleanupIds[82], $cleanupIds[83], $cleanupIds[84], $cleanupIds[85], $cleanupIds[86], $cleanupIds[87], $cleanupIds[88], $cleanupIds[89], $cleanupIds[90], $cleanupIds[91], $cleanupIds[92], $cleanupIds[93], $cleanupIds[94], $cleanupIds[95], $cleanupIds[96], $cleanupIds[97], $cleanupIds[98], $cleanupIds[99], $cleanupIds[100], $cleanupIds[101], $cleanupIds[102], $cleanupIds[103], $cleanupIds[104], $cleanupIds[105], $cleanupIds[106], $cleanupIds[107], $cleanupIds[108], $cleanupIds[109], $cleanupIds[110], $cleanupIds[111], $cleanupIds[112], $cleanupIds[113], $cleanupIds[114], $cleanupIds[115], $cleanupIds[116], $cleanupIds[117], $cleanupIds[118], $cleanupIds[119], $cleanupIds[120], $cleanupIds[121], $cleanupIds[122], $cleanupIds[123], $cleanupIds[124], $cleanupIds[125], $cleanupIds[126], $cleanupIds[127], $cleanupIds[128], $cleanupIds[129], $cleanupIds[130], $cleanupIds[131], $cleanupIds[132], $cleanupIds[133], $cleanupIds[134], $cleanupIds[135], $cleanupIds[136], $cleanupIds[137], $cleanupIds[138], $cleanupIds[139], $cleanupIds[140], $cleanupIds[141], $cleanupIds[142], $cleanupIds[143], $cleanupIds[144], $cleanupIds[145], $cleanupIds[146], $cleanupIds[147], $cleanupIds[148], $cleanupIds[149], $cleanupIds[150], $cleanupIds[151], $cleanupIds[152], $cleanupIds[153], $cleanupIds[154], $cleanupIds[155], $cleanupIds[156], $cleanupIds[157], $cleanupIds[158], $cleanupIds[159], $cleanupIds[160], $cleanupIds[161], $cleanupIds[162], $cleanupIds[163], $cleanupIds[164], $cleanupIds[165], $cleanupIds[166], $cleanupIds[167], $cleanupIds[168], $cleanupIds[169], $cleanupIds[170], $cleanupIds[171], $cleanupIds[172], $cleanupIds[173], $cleanupIds[174], $cleanupIds[175], $cleanupIds[176], $cleanupIds[177], $cleanupIds[178], $cleanupIds[179], $cleanupIds[180], $cleanupIds[181], $cleanupIds[182], $cleanupIds[183], $cleanupIds[184], $cleanupIds[185], $cleanupIds[186], $cleanupIds[187], $cleanupIds[188], $cleanupIds[189], $cleanupIds[190], $cleanupIds[191], $cleanupIds[192], $cleanupIds[193], $cleanupIds[194], $cleanupIds[195], $cleanupIds[196], $cleanupIds[197], $cleanupIds[198], $cleanupIds[199], $cleanupIds[200], $cleanupIds[201], $cleanupIds[202], $cleanupIds[203], $cleanupIds[204], $cleanupIds[205], $cleanupIds[206], $cleanupIds[207], $cleanupIds[208], $cleanupIds[209], $cleanupIds[210], $cleanupIds[211], $cleanupIds[212], $cleanupIds[213], $cleanupIds[214], $cleanupIds[215], $cleanupIds[216], $cleanupIds[217], $cleanupIds[218], $cleanupIds[219], $cleanupIds[220], $cleanupIds[221], $cleanupIds[222], $cleanupIds[223], $cleanupIds[224], $cleanupIds[225], $cleanupIds[226], $cleanupIds[227], $cleanupIds[228], $cleanupIds[229], $cleanupIds[230], $cleanupIds[231], $cleanupIds[232], $cleanupIds[233], $cleanupIds[234], $cleanupIds[235], $cleanupIds[236], $cleanupIds[237], $cleanupIds[238], $cleanupIds[239], $cleanupIds[240], $cleanupIds[241], $cleanupIds[242], $cleanupIds[243], $cleanupIds[244], $cleanupIds[245], $cleanupIds[246], $cleanupIds[247], $cleanupIds[248], $cleanupIds[249], $cleanupIds[250], $cleanupIds[251], $cleanupIds[252], $cleanupIds[253], $cleanupIds[254], $cleanupIds[255], $cleanupIds[256], $cleanupIds[257], $cleanupIds[258], $cleanupIds[259], $cleanupIds[260], $cleanupIds[261], $cleanupIds[262], $cleanupIds[263], $cleanupIds[264], $cleanupIds[265], $cleanupIds[266], $cleanupIds[267], $cleanupIds[268], $cleanupIds[269], $cleanupIds[270], $cleanupIds[271], $cleanupIds[272], $cleanupIds[273], $cleanupIds[274], $cleanupIds[275], $cleanupIds[276], $cleanupIds[277], $cleanupIds[278], $cleanupIds[279], $cleanupIds[280], $cleanupIds[281], $cleanupIds[282], $cleanupIds[283], $cleanupIds[284], $cleanupIds[285], $cleanupIds[286], $cleanupIds[287], $cleanupIds[288], $cleanupIds[289], $cleanupIds[290], $cleanupIds[291], $cleanupIds[292], $cleanupIds[293], $cleanupIds[294], $cleanupIds[295], $cleanupIds[296], $cleanupIds[297], $cleanupIds[298], $cleanupIds[299], $cleanupIds[300], $cleanupIds[301], $cleanupIds[302], $cleanupIds[303], $cleanupIds[304], $cleanupIds[305], $cleanupIds[306], $cleanupIds[307], $cleanupIds[308], $cleanupIds[309], $cleanupIds[310], $cleanupIds[311], $cleanupIds[312], $cleanupIds[313], $cleanupIds[314], $cleanupIds[315], $cleanupIds[316], $cleanupIds[317], $cleanupIds[318], $cleanupIds[319], $cleanupIds[320], $cleanupIds[321], $cleanupIds[322], $cleanupIds[323], $cleanupIds[324], $cleanupIds[325], $cleanupIds[326], $cleanupIds[327], $cleanupIds[328], $cleanupIds[329], $cleanupIds[330], $cleanupIds[331], $cleanupIds[332], $cleanupIds[333], $cleanupIds[334], $cleanupIds[335], $cleanupIds[336], $cleanupIds[337], $cleanupIds[338], $cleanupIds[339], $cleanupIds[340], $cleanupIds[341], $cleanupIds[342], $cleanupIds[343], $cleanupIds[344], $cleanupIds[345], $cleanupIds[346], $cleanupIds[347], $cleanupIds[348], $cleanupIds[349], $cleanupIds[350], $cleanupIds[351], $cleanupIds[352], $cleanupIds[353], $cleanupIds[354], $cleanupIds[355], $cleanupIds[356], $cleanupIds[357], $cleanupIds[358], $cleanupIds[359], $cleanupIds[360], $cleanupIds[361], $cleanupIds[362], $cleanupIds[363], $cleanupIds[364], $cleanupIds[365], $cleanupIds[366], $cleanupIds[367], $cleanupIds[368], $cleanupIds[369], $cleanupIds[370], $cleanupIds[371], $cleanupIds[372], $cleanupIds[373], $cleanupIds[374], $cleanupIds[375], $cleanupIds[376], $cleanupIds[377], $cleanupIds[378], $cleanupIds[379], $cleanupIds[380], $cleanupIds[381], $cleanupIds[382], $cleanupIds[383], $cleanupIds[384], $cleanupIds[385], $cleanupIds[386], $cleanupIds[387], $cleanupIds[388], $cleanupIds[389], $cleanupIds[390], $cleanupIds[391], $cleanupIds[392], $cleanupIds[393], $cleanupIds[394], $cleanupIds[395], $cleanupIds[396], $cleanupIds[397], $cleanupIds[398], $cleanupIds[399], $cleanupIds[400], $cleanupIds[401], $cleanupIds[402], $cleanupIds[403], $cleanupIds[404], $cleanupIds[405], $cleanupIds[406], $cleanupIds[407], $cleanupIds[408], $cleanupIds[409], $cleanupIds[410], $cleanupIds[411], $cleanupIds[412], $cleanupIds[413], $cleanupIds[414], $cleanupIds[415], $cleanupIds[416], $cleanupIds[417], $cleanupIds[418], $cleanupIds[419], $cleanupIds[420], $cleanupIds[421], $cleanupIds[422], $cleanupIds[423], $cleanupIds[424], $cleanupIds[425], $cleanupIds[426], $cleanupIds[427], $cleanupIds[428], $cleanupIds[429], $cleanupIds[430], $cleanupIds[431], $cleanupIds[432], $cleanupIds[433], $cleanupIds[434], $cleanupIds[435], $cleanupIds[436], $cleanupIds[437], $cleanupIds[438], $cleanupIds[439], $cleanupIds[440], $cleanupIds[441], $cleanupIds[442], $cleanupIds[443], $cleanupIds[444], $cleanupIds[445], $cleanupIds[446], $cleanupIds[447], $cleanupIds[448], $cleanupIds[449], $cleanupIds[450], $cleanupIds[451], $cleanupIds[452], $cleanupIds[453], $cleanupIds[454], $cleanupIds[455], $cleanupIds[456], $cleanupIds[457], $cleanupIds[458], $cleanupIds[459], $cleanupIds[460], $cleanupIds[461], $cleanupIds[462], $cleanupIds[463], $cleanupIds[464], $cleanupIds[465], $cleanupIds[466], $cleanupIds[467], $cleanupIds[468], $cleanupIds[469], $cleanupIds[470], $cleanupIds[471], $cleanupIds[472], $cleanupIds[473], $cleanupIds[474], $cleanupIds[475], $cleanupIds[476], $cleanupIds[477], $cleanupIds[478], $cleanupIds[479], $cleanupIds[480], $cleanupIds[481], $cleanupIds[482], $cleanupIds[483], $cleanupIds[484], $cleanupIds[485], $cleanupIds[486], $cleanupIds[487], $cleanupIds[488], $cleanupIds[489], $cleanupIds[490], $cleanupIds[491], $cleanupIds[492], $cleanupIds[493], $cleanupIds[494], $cleanupIds[495], $cleanupIds[496], $cleanupIds[497], $cleanupIds[498], $cleanupIds[499], $cleanupIds[500], $cleanupIds[501], $cleanupIds[502], $cleanupIds[503], $cleanupIds[504], $cleanupIds[505], $cleanupIds[506], $cleanupIds[507], $cleanupIds[508], $cleanupIds[509], $cleanupIds[510], $cleanupIds[511], $cleanupIds[512], $cleanupIds[513], $cleanupIds[514], $cleanupIds[515], $cleanupIds[516], $cleanupIds[517], $cleanupIds[518], $cleanupIds[519], $cleanupIds[520], $cleanupIds[521], $cleanupIds[522], $cleanupIds[523], $cleanupIds[524], $cleanupIds[525], $cleanupIds[526], $cleanupIds[527], $cleanupIds[528], $cleanupIds[529], $cleanupIds[530], $cleanupIds[531], $cleanupIds[532], $cleanupIds[533], $cleanupIds[534], $cleanupIds[535], $cleanupIds[536], $cleanupIds[537], $cleanupIds[538], $cleanupIds[539], $cleanupIds[540], $cleanupIds[541], $cleanupIds[542], $cleanupIds[543], $cleanupIds[544], $cleanupIds[545], $cleanupIds[546], $cleanupIds[547], $cleanupIds[548], $cleanupIds[549], $cleanupIds[550], $cleanupIds[551], $cleanupIds[552], $cleanupIds[553], $cleanupIds[554], $cleanupIds[555], $cleanupIds[556], $cleanupIds[557], $cleanupIds[558], $cleanupIds[559], $cleanupIds[560], $cleanupIds[561], $cleanupIds[562], $cleanupIds[563], $cleanupIds[564], $cleanupIds[565], $cleanupIds[566], $cleanupIds[567], $cleanupIds[568], $cleanupIds[569], $cleanupIds[570], $cleanupIds[571], $cleanupIds[572], $cleanupIds[573], $cleanupIds[574], $cleanupIds[575], $cleanupIds[576], $cleanupIds[577], $cleanupIds[578], $cleanupIds[579], $cleanupIds[580], $cleanupIds[581], $cleanupIds[582], $cleanupIds[583], $cleanupIds[584], $cleanupIds[585], $cleanupIds[586], $cleanupIds[587], $cleanupIds[588], $cleanupIds[589], $cleanupIds[590], $cleanupIds[591], $cleanupIds[592], $cleanupIds[593], $cleanupIds[594], $cleanupIds[595], $cleanupIds[596], $cleanupIds[597], $cleanupIds[598], $cleanupIds[599], $cleanupIds[600], $cleanupIds[601], $cleanupIds[602], $cleanupIds[603], $cleanupIds[604], $cleanupIds[605], $cleanupIds[606], $cleanupIds[607], $cleanupIds[608], $cleanupIds[609], $cleanupIds[610], $cleanupIds[611], $cleanupIds[612], $cleanupIds[613], $cleanupIds[614], $cleanupIds[615], $cleanupIds[616], $cleanupIds[617], $cleanupIds[618], $cleanupIds[619], $cleanupIds[620], $cleanupIds[621], $cleanupIds[622], $cleanupIds[623], $cleanupIds[624], $cleanupIds[625], $cleanupIds[626], $cleanupIds[627], $cleanupIds[628], $cleanupIds[629], $cleanupIds[630], $cleanupIds[631], $cleanupIds[632], $cleanupIds[633], $cleanupIds[634], $cleanupIds[635], $cleanupIds[636], $cleanupIds[637], $cleanupIds[638], $cleanupIds[639], $cleanupIds[640], $cleanupIds[641], $cleanupIds[642], $cleanupIds[643], $cleanupIds[644], $cleanupIds[645], $cleanupIds[646], $cleanupIds[647], $cleanupIds[648], $cleanupIds[649], $cleanupIds[650], $cleanupIds[651], $cleanupIds[652], $cleanupIds[653], $cleanupIds[654], $cleanupIds[655], $cleanupIds[656], $cleanupIds[657], $cleanupIds[658], $cleanupIds[659], $cleanupIds[660], $cleanupIds[661], $cleanupIds[662], $cleanupIds[663], $cleanupIds[664], $cleanupIds[665], $cleanupIds[666], $cleanupIds[667], $cleanupIds[668], $cleanupIds[669], $cleanupIds[670], $cleanupIds[671], $cleanupIds[672], $cleanupIds[673], $cleanupIds[674], $cleanupIds[675], $cleanupIds[676], $cleanupIds[677], $cleanupIds[678], $cleanupIds[679], $cleanupIds[680], $cleanupIds[681], $cleanupIds[682], $cleanupIds[683], $cleanupIds[684], $cleanupIds[685], $cleanupIds[686], $cleanupIds[687], $cleanupIds[688], $cleanupIds[689], $cleanupIds[690], $cleanupIds[691], $cleanupIds[692], $cleanupIds[693], $cleanupIds[694], $cleanupIds[695], $cleanupIds[696], $cleanupIds[697], $cleanupIds[698], $cleanupIds[699], $cleanupIds[700], $cleanupIds[701], $cleanupIds[702], $cleanupIds[703], $cleanupIds[704], $cleanupIds[705], $cleanupIds[706], $cleanupIds[707], $cleanupIds[708], $cleanupIds[709], $cleanupIds[710], $cleanupIds[711], $cleanupIds[712], $cleanupIds[713], $cleanupIds[714], $cleanupIds[715], $cleanupIds[716], $cleanupIds[717], $cleanupIds[718], $cleanupIds[719], $cleanupIds[720], $cleanupIds[721], $cleanupIds[722], $cleanupIds[723], $cleanupIds[724], $cleanupIds[725], $cleanupIds[726], $cleanupIds[727], $cleanupIds[728], $cleanupIds[729], $cleanupIds[730], $cleanupIds[731], $cleanupIds[732], $cleanupIds[733], $cleanupIds[734], $cleanupIds[735], $cleanupIds[736], $cleanupIds[737], $cleanupIds[738], $cleanupIds[739], $cleanupIds[740], $cleanupIds[741], $cleanupIds[742], $cleanupIds[743], $cleanupIds[744], $cleanupIds[745], $cleanupIds[746], $cleanupIds[747], $cleanupIds[748], $cleanupIds[749], $cleanupIds[750], $cleanupIds[751], $cleanupIds[752], $cleanupIds[753], $cleanupIds[754], $cleanupIds[755], $cleanupIds[756], $cleanupIds[757], $cleanupIds[758], $cleanupIds[759], $cleanupIds[760], $cleanupIds[761], $cleanupIds[762], $cleanupIds[763], $cleanupIds[764], $cleanupIds[765], $cleanupIds[766], $cleanupIds[767], $cleanupIds[768], $cleanupIds[769], $cleanupIds[770], $cleanupIds[771], $cleanupIds[772], $cleanupIds[773], $cleanupIds[774], $cleanupIds[775], $cleanupIds[776], $cleanupIds[777], $cleanupIds[778], $cleanupIds[779], $cleanupIds[780], $cleanupIds[781], $cleanupIds[782], $cleanupIds[783], $cleanupIds[784], $cleanupIds[785], $cleanupIds[786], $cleanupIds[787], $cleanupIds[788], $cleanupIds[789], $cleanupIds[790], $cleanupIds[791], $cleanupIds[792], $cleanupIds[793], $cleanupIds[794], $cleanupIds[795], $cleanupIds[796], $cleanupIds[797], $cleanupIds[798], $cleanupIds[799], $cleanupIds[800], $cleanupIds[801], $cleanupIds[802], $cleanupIds[803], $cleanupIds[804], $cleanupIds[805], $cleanupIds[806], $cleanupIds[807], $cleanupIds[808], $cleanupIds[809], $cleanupIds[810], $cleanupIds[811], $cleanupIds[812], $cleanupIds[813], $cleanupIds[814], $cleanupIds[815], $cleanupIds[816], $cleanupIds[817], $cleanupIds[818], $cleanupIds[819], $cleanupIds[820], $cleanupIds[821], $cleanupIds[822], $cleanupIds[823], $cleanupIds[824], $cleanupIds[825], $cleanupIds[826], $cleanupIds[827], $cleanupIds[828], $cleanupIds[829], $cleanupIds[830], $cleanupIds[831], $cleanupIds[832], $cleanupIds[833], $cleanupIds[834], $cleanupIds[835], $cleanupIds[836], $cleanupIds[837], $cleanupIds[838], $cleanupIds[839], $cleanupIds[840], $cleanupIds[841], $cleanupIds[842], $cleanupIds[843], $cleanupIds[844], $cleanupIds[845], $cleanupIds[846], $cleanupIds[847], $cleanupIds[848], $cleanupIds[849], $cleanupIds[850], $cleanupIds[851], $cleanupIds[852], $cleanupIds[853], $cleanupIds[854], $cleanupIds[855], $cleanupIds[856], $cleanupIds[857], $cleanupIds[858], $cleanupIds[859], $cleanupIds[860], $cleanupIds[861], $cleanupIds[862], $cleanupIds[863], $cleanupIds[864], $cleanupIds[865], $cleanupIds[866], $cleanupIds[867], $cleanupIds[868], $cleanupIds[869], $cleanupIds[870], $cleanupIds[871], $cleanupIds[872], $cleanupIds[873], $cleanupIds[874], $cleanupIds[875], $cleanupIds[876], $cleanupIds[877], $cleanupIds[878], $cleanupIds[879], $cleanupIds[880], $cleanupIds[881], $cleanupIds[882], $cleanupIds[883], $cleanupIds[884], $cleanupIds[885], $cleanupIds[886], $cleanupIds[887], $cleanupIds[888], $cleanupIds[889], $cleanupIds[890], $cleanupIds[891], $cleanupIds[892], $cleanupIds[893], $cleanupIds[894], $cleanupIds[895], $cleanupIds[896], $cleanupIds[897], $cleanupIds[898], $cleanupIds[899], $cleanupIds[900], $cleanupIds[901], $cleanupIds[902], $cleanupIds[903], $cleanupIds[904], $cleanupIds[905], $cleanupIds[906], $cleanupIds[907], $cleanupIds[908], $cleanupIds[909], $cleanupIds[910], $cleanupIds[911], $cleanupIds[912], $cleanupIds[913], $cleanupIds[914], $cleanupIds[915], $cleanupIds[916], $cleanupIds[917], $cleanupIds[918], $cleanupIds[919], $cleanupIds[920], $cleanupIds[921], $cleanupIds[922], $cleanupIds[923], $cleanupIds[924], $cleanupIds[925], $cleanupIds[926], $cleanupIds[927], $cleanupIds[928], $cleanupIds[929], $cleanupIds[930], $cleanupIds[931], $cleanupIds[932], $cleanupIds[933], $cleanupIds[934], $cleanupIds[935], $cleanupIds[936], $cleanupIds[937], $cleanupIds[938], $cleanupIds[939], $cleanupIds[940], $cleanupIds[941], $cleanupIds[942], $cleanupIds[943], $cleanupIds[944], $cleanupIds[945], $cleanupIds[946], $cleanupIds[947], $cleanupIds[948], $cleanupIds[949], $cleanupIds[950], $cleanupIds[951], $cleanupIds[952], $cleanupIds[953], $cleanupIds[954], $cleanupIds[955], $cleanupIds[956], $cleanupIds[957], $cleanupIds[958], $cleanupIds[959], $cleanupIds[960], $cleanupIds[961], $cleanupIds[962], $cleanupIds[963], $cleanupIds[964], $cleanupIds[965], $cleanupIds[966], $cleanupIds[967], $cleanupIds[968], $cleanupIds[969], $cleanupIds[970], $cleanupIds[971], $cleanupIds[972], $cleanupIds[973], $cleanupIds[974], $cleanupIds[975], $cleanupIds[976], $cleanupIds[977], $cleanupIds[978], $cleanupIds[979], $cleanupIds[980], $cleanupIds[981], $cleanupIds[982], $cleanupIds[983], $cleanupIds[984], $cleanupIds[985], $cleanupIds[986], $cleanupIds[987], $cleanupIds[988], $cleanupIds[989], $cleanupIds[990], $cleanupIds[991], $cleanupIds[992], $cleanupIds[993], $cleanupIds[994], $cleanupIds[995], $cleanupIds[996], $cleanupIds[997], $cleanupIds[998], $cleanupIds[999], $cleanupIds[1000], $cleanupIds[1001], $cleanupIds[1002], $cleanupIds[1003], $cleanupIds[1004], $cleanupIds[1005], $cleanupIds[1006], $cleanupIds[1007], $cleanupIds[1008], $cleanupIds[1009], $cleanupIds[1010], $cleanupIds[1011], $cleanupIds[1012], $cleanupIds[1013], $cleanupIds[1014], $cleanupIds[1015], $cleanupIds[1016], $cleanupIds[1017], $cleanupIds[1018], $cleanupIds[1019], $cleanupIds[1020], $cleanupIds[1021], $cleanupIds[1022], $cleanupIds[1023], $cleanupIds[1024], $cleanupIds[1025], $cleanupIds[1026], $cleanupIds[1027], $cleanupIds[1028], $cleanupIds[1029], $cleanupIds[1030], $cleanupIds[1031], $cleanupIds[1032], $cleanupIds[1033], $cleanupIds[1034], $cleanupIds[1035], $cleanupIds[1036], $cleanupIds[1037], $cleanupIds[1038], $cleanupIds[1039], $cleanupIds[1040], $cleanupIds[1041], $cleanupIds[1042], $cleanupIds[1043], $cleanupIds[1044], $cleanupIds[1045], $cleanupIds[1046], $cleanupIds[1047], $cleanupIds[1048], $cleanupIds[1049], $cleanupIds[1050], $cleanupIds[1051], $cleanupIds[1052], $cleanupIds[1053], $cleanupIds[1054], $cleanupIds[1055], $cleanupIds[1056], $cleanupIds[1057], $cleanupIds[1058], $cleanupIds[1059], $cleanupIds[1060], $cleanupIds[1061], $cleanupIds[1062], $cleanupIds[1063], $cleanupIds[1064], $cleanupIds[1065], $cleanupIds[1066], $cleanupIds[1067], $cleanupIds[1068], $cleanupIds[1069], $cleanupIds[1070], $cleanupIds[1071], $cleanupIds[1072], $cleanupIds[1073], $cleanupIds[1074], $cleanupIds[1075], $cleanupIds[1076], $cleanupIds[1077], $cleanupIds[1078], $cleanupIds[1079], $cleanupIds[1080], $cleanupIds[1081], $cleanupIds[1082], $cleanupIds[1083], $cleanupIds[1084], $cleanupIds[1085], $cleanupIds[1086], $cleanupIds[1087], $cleanupIds[1088], $cleanupIds[1089], $cleanupIds[1090], $cleanupIds[1091], $cleanupIds[1092], $cleanupIds[1093], $cleanupIds[1094], $cleanupIds[1095], $cleanupIds[1096], $cleanupIds[1097], $cleanupIds[1098], $cleanupIds[1099], $cleanupIds[1100], $cleanupIds[1101], $cleanupIds[1102], $cleanupIds[1103], $cleanupIds[1104], $cleanupIds[1105], $cleanupIds[1106], $cleanupIds[1107], $cleanupIds[1108], $cleanupIds[1109], $cleanupIds[1110], $cleanupIds[1111], $cleanupIds[1112], $cleanupIds[1113], $cleanupIds[1114], $cleanupIds[1115], $cleanupIds[1116], $cleanupIds[1117], $cleanupIds[1118], $cleanupIds[1119], $cleanupIds[1120], $cleanupIds[1121], $cleanupIds[1122], $cleanupIds[1123], $cleanupIds[1124], $cleanupIds[1125], $cleanupIds[1126], $cleanupIds[1127], $cleanupIds[1128], $cleanupIds[1129], $cleanupIds[1130], $cleanupIds[1131], $cleanupIds[1132], $cleanupIds[1133], $cleanupIds[1134], $cleanupIds[1135], $cleanupIds[1136], $cleanupIds[1137], $cleanupIds[1138], $cleanupIds[1139], $cleanupIds[1140], $cleanupIds[1141], $cleanupIds[1142], $cleanupIds[1143], $cleanupIds[1144], $cleanupIds[1145], $cleanupIds[1146], $cleanupIds[1147], $cleanupIds[1148], $cleanupIds[1149], $cleanupIds[1150], $cleanupIds[1151], $cleanupIds[1152], $cleanupIds[1153], $cleanupIds[1154], $cleanupIds[1155], $cleanupIds[1156], $cleanupIds[1157], $cleanupIds[1158], $cleanupIds[1159], $cleanupIds[1160], $cleanupIds[1161], $cleanupIds[1162], $cleanupIds[1163], $cleanupIds[1164], $cleanupIds[1165], $cleanupIds[1166], $cleanupIds[1167], $cleanupIds[1168], $cleanupIds[1169], $cleanupIds[1170], $cleanupIds[1171], $cleanupIds[1172], $cleanupIds[1173], $cleanupIds[1174], $cleanupIds[1175], $cleanupIds[1176], $cleanupIds[1177], $cleanupIds[1178], $cleanupIds[1179], $cleanupIds[1180], $cleanupIds[1181], $cleanupIds[1182], $cleanupIds[1183], $cleanupIds[1184], $cleanupIds[1185], $cleanupIds[1186], $cleanupIds[1187], $cleanupIds[1188], $cleanupIds[1189], $cleanupIds[1190], $cleanupIds[1191], $cleanupIds[1192], $cleanupIds[1193], $cleanupIds[1194], $cleanupIds[1195], $cleanupIds[1196], $cleanupIds[1197], $cleanupIds[1198], $cleanupIds[1199], $cleanupIds[1200], $cleanupIds[1201], $cleanupIds[1202], $cleanupIds[1203], $cleanupIds[1204], $cleanupIds[1205], $cleanupIds[1206], $cleanupIds[1207], $cleanupIds[1208], $cleanupIds[1209], $cleanupIds[1210], $cleanupIds[1211], $cleanupIds[1212], $cleanupIds[1213], $cleanupIds[1214], $cleanupIds[1215], $cleanupIds[1216], $cleanupIds[1217], $cleanupIds[1218], $cleanupIds[1219], $cleanupIds[1220], $cleanupIds[1221], $cleanupIds[1222], $cleanupIds[1223], $cleanupIds[1224], $cleanupIds[1225], $cleanupIds[1226], $cleanupIds[1227], $cleanupIds[1228], $cleanupIds[1229], $cleanupIds[1230], $cleanupIds[1231], $cleanupIds[1232], $cleanupIds[1233], $cleanupIds[1234], $cleanupIds[1235], $cleanupIds[1236], $cleanupIds[1237], $cleanupIds[1238], $cleanupIds[1239], $cleanupIds[1240], $cleanupIds[1241], $cleanupIds[1242], $cleanupIds[1243], $cleanupIds[1244], $cleanupIds[1245], $cleanupIds[1246], $cleanupIds[1247], $cleanupIds[1248], $cleanupIds[1249], $cleanupIds[1250], $cleanupIds[1251], $cleanupIds[1252], $cleanupIds[1253], $cleanupIds[1254], $cleanupIds[1255], $cleanupIds[1256], $cleanupIds[1257], $cleanupIds[1258], $cleanupIds[1259], $cleanupIds[1260], $cleanupIds[1261], $cleanupIds[1262], $cleanupIds[1263], $cleanupIds[1264], $cleanupIds[1265], $cleanupIds[1266], $cleanupIds[1267], $cleanupIds[1268], $cleanupIds[1269], $cleanupIds[1270], $cleanupIds[1271], $cleanupIds[1272], $cleanupIds[1273], $cleanupIds[1274], $cleanupIds[1275], $cleanupIds[1276], $cleanupIds[1277], $cleanupIds[1278], $cleanupIds[1279], $cleanupIds[1280], $cleanupIds[1281], $cleanupIds[1282], $cleanupIds[1283], $cleanupIds[1284], $cleanupIds[1285], $cleanupIds[1286], $cleanupIds[1287], $cleanupIds[1288], $cleanupIds[1289], $cleanupIds[1290], $cleanupIds[1291], $cleanupIds[1292], $cleanupIds[1293], $cleanupIds[1294], $cleanupIds[1295], $cleanupIds[1296], $cleanupIds[1297], $cleanupIds[1298], $cleanupIds[1299], $cleanupIds[1300], $cleanupIds[1301], $cleanupIds[1302], $cleanupIds[1303], $cleanupIds[1304], $cleanupIds[1305], $cleanupIds[1306], $cleanupIds[1307], $cleanupIds[1308], $cleanupIds[1309], $cleanupIds[1310], $cleanupIds[1311], $cleanupIds[1312], $cleanupIds[1313], $cleanupIds[1314], $cleanupIds[1315], $cleanupIds[1316], $cleanupIds[1317], $cleanupIds[1318], $cleanupIds[1319], $cleanupIds[1320], $cleanupIds[1321], $cleanupIds[1322], $cleanupIds[1323], $cleanupIds[1324], $cleanupIds[1325], $cleanupIds[1326], $cleanupIds[1327], $cleanupIds[1328], $cleanupIds[1329], $cleanupIds[1330], $cleanupIds[1331], $cleanupIds[1332], $cleanupIds[1333], $cleanupIds[1334], $cleanupIds[1335], $cleanupIds[1336], $cleanupIds[1337], $cleanupIds[1338], $cleanupIds[1339], $cleanupIds[1340], $cleanupIds[1341], $cleanupIds[1342], $cleanupIds[1343], $cleanupIds[1344], $cleanupIds[1345], $cleanupIds[1346], $cleanupIds[1347], $cleanupIds[1348], $cleanupIds[1349], $cleanupIds[1350], $cleanupIds[1351], $cleanupIds[1352], $cleanupIds[1353], $cleanupIds[1354], $cleanupIds[1355], $cleanupIds[1356], $cleanupIds[1357], $cleanupIds[1358], $cleanupIds[1359], $cleanupIds[1360], $cleanupIds[1361], $cleanupIds[1362], $cleanupIds[1363], $cleanupIds[1364], $cleanupIds[1365], $cleanupIds[1366], $cleanupIds[1367], $cleanupIds[1368], $cleanupIds[1369], $cleanupIds[1370], $cleanupIds[1371], $cleanupIds[1372], $cleanupIds[1373], $cleanupIds[1374], $cleanupIds[1375], $cleanupIds[1376], $cleanupIds[1377], $cleanupIds[1378], $cleanupIds[1379], $cleanupIds[1380], $cleanupIds[1381], $cleanupIds[1382], $cleanupIds[1383], $cleanupIds[1384], $cleanupIds[1385], $cleanupIds[1386], $cleanupIds[1387], $cleanupIds[1388], $cleanupIds[1389], $cleanupIds[1390], $cleanupIds[1391], $cleanupIds[1392], $cleanupIds[1393], $cleanupIds[1394], $cleanupIds[1395], $cleanupIds[1396], $cleanupIds[1397], $cleanupIds[1398], $cleanupIds[1399], $cleanupIds[1400], $cleanupIds[1401], $cleanupIds[1402], $cleanupIds[1403], $cleanupIds[1404], $cleanupIds[1405], $cleanupIds[1406], $cleanupIds[1407], $cleanupIds[1408], $cleanupIds[1409], $cleanupIds[1410], $cleanupIds[1411], $cleanupIds[1412], $cleanupIds[1413], $cleanupIds[1414], $cleanupIds[1415], $cleanupIds[1416], $cleanupIds[1417], $cleanupIds[1418], $cleanupIds[1419], $cleanupIds[1420], $cleanupIds[1421], $cleanupIds[1422], $cleanupIds[1423], $cleanupIds[1424], $cleanupIds[1425], $cleanupIds[1426], $cleanupIds[1427], $cleanupIds[1428], $cleanupIds[1429], $cleanupIds[1430], $cleanupIds[1431], $cleanupIds[1432], $cleanupIds[1433], $cleanupIds[1434], $cleanupIds[1435], $cleanupIds[1436], $cleanupIds[1437], $cleanupIds[1438], $cleanupIds[1439], $cleanupIds[1440], $cleanupIds[1441], $cleanupIds[1442], $cleanupIds[1443], $cleanupIds[1444], $cleanupIds[1445], $cleanupIds[1446], $cleanupIds[1447], $cleanupIds[1448], $cleanupIds[1449], $cleanupIds[1450], $cleanupIds[1451], $cleanupIds[1452], $cleanupIds[1453], $cleanupIds[1454], $cleanupIds[1455], $cleanupIds[1456], $cleanupIds[1457], $cleanupIds[1458], $cleanupIds[1459], $cleanupIds[1460], $cleanupIds[1461], $cleanupIds[1462], $cleanupIds[1463], $cleanupIds[1464], $cleanupIds[1465], $cleanupIds[1466], $cleanupIds[1467], $cleanupIds[1468], $cleanupIds[1469], $cleanupIds[1470], $cleanupIds[1471], $cleanupIds[1472], $cleanupIds[1473], $cleanupIds[1474], $cleanupIds[1475], $cleanupIds[1476], $cleanupIds[1477], $cleanupIds[1478], $cleanupIds[1479], $cleanupIds[1480], $cleanupIds[1481], $cleanupIds[1482], $cleanupIds[1483], $cleanupIds[1484], $cleanupIds[1485], $cleanupIds[1486], $cleanupIds[1487], $cleanupIds[1488], $cleanupIds[1489], $cleanupIds[1490], $cleanupIds[1491], $cleanupIds[1492], $cleanupIds[1493], $cleanupIds[1494], $cleanupIds[1495], $cleanupIds[1496], $cleanupIds[1497], $cleanupIds[1498], $cleanupIds[1499], $cleanupIds[1500], $cleanupIds[1501], $cleanupIds[1502], $cleanupIds[1503], $cleanupIds[1504], $cleanupIds[1505], $cleanupIds[1506], $cleanupIds[1507], $cleanupIds[1508], $cleanupIds[1509], $cleanupIds[1510], $cleanupIds[1511], $cleanupIds[1512], $cleanupIds[1513], $cleanupIds[1514], $cleanupIds[1515], $cleanupIds[1516], $cleanupIds[1517], $cleanupIds[1518], $cleanupIds[1519], $cleanupIds[1520], $cleanupIds[1521], $cleanupIds[1522], $cleanupIds[1523], $cleanupIds[1524], $cleanupIds[1525], $cleanupIds[1526], $cleanupIds[1527], $cleanupIds[1528], $cleanupIds[1529], $cleanupIds[1530], $cleanupIds[1531], $cleanupIds[1532], $cleanupIds[1533], $cleanupIds[1534], $cleanupIds[1535], $cleanupIds[1536], $cleanupIds[1537], $cleanupIds[1538], $cleanupIds[1539], $cleanupIds[1540], $cleanupIds[1541], $cleanupIds[1542], $cleanupIds[1543], $cleanupIds[1544], $cleanupIds[1545], $cleanupIds[1546], $cleanupIds[1547], $cleanupIds[1548], $cleanupIds[1549], $cleanupIds[1550], $cleanupIds[1551], $cleanupIds[1552], $cleanupIds[1553], $cleanupIds[1554], $cleanupIds[1555], $cleanupIds[1556], $cleanupIds[1557], $cleanupIds[1558], $cleanupIds[1559], $cleanupIds[1560], $cleanupIds[1561], $cleanupIds[1562], $cleanupIds[1563], $cleanupIds[1564], $cleanupIds[1565], $cleanupIds[1566], $cleanupIds[1567], $cleanupIds[1568], $cleanupIds[1569], $cleanupIds[1570], $cleanupIds[1571], $cleanupIds[1572], $cleanupIds[1573], $cleanupIds[1574], $cleanupIds[1575], $cleanupIds[1576], $cleanupIds[1577], $cleanupIds[1578], $cleanupIds[1579], $cleanupIds[1580], $cleanupIds[1581], $cleanupIds[1582], $cleanupIds[1583], $cleanupIds[1584], $cleanupIds[1585], $cleanupIds[1586], $cleanupIds[1587], $cleanupIds[1588], $cleanupIds[1589], $cleanupIds[1590], $cleanupIds[1591], $cleanupIds[1592], $cleanupIds[1593], $cleanupIds[1594], $cleanupIds[1595], $cleanupIds[1596], $cleanupIds[1597], $cleanupIds[1598], $cleanupIds[1599], $cleanupIds[1600], $cleanupIds[1601], $cleanupIds[1602], $cleanupIds[1603], $cleanupIds[1604], $cleanupIds[1605], $cleanupIds[1606], $cleanupIds[1607], $cleanupIds[1608], $cleanupIds[1609], $cleanupIds[1610], $cleanupIds[1611], $cleanupIds[1612], $cleanupIds[1613], $cleanupIds[1614], $cleanupIds[1615], $cleanupIds[1616], $cleanupIds[1617], $cleanupIds[1618], $cleanupIds[1619], $cleanupIds[1620], $cleanupIds[1621], $cleanupIds[1622], $cleanupIds[1623], $cleanupIds[1624], $cleanupIds[1625], $cleanupIds[1626], $cleanupIds[1627], $cleanupIds[1628], $cleanupIds[1629], $cleanupIds[1630], $cleanupIds[1631], $cleanupIds[1632], $cleanupIds[1633], $cleanupIds[1634], $cleanupIds[1635], $cleanupIds[1636], $cleanupIds[1637], $cleanupIds[1638], $cleanupIds[1639], $cleanupIds[1640], $cleanupIds[1641], $cleanupIds[1642], $cleanupIds[1643], $cleanupIds[1644], $cleanupIds[1645], $cleanupIds[1646], $cleanupIds[1647], $cleanupIds[1648], $cleanupIds[1649], $cleanupIds[1650], $cleanupIds[1651], $cleanupIds[1652], $cleanupIds[1653], $cleanupIds[1654], $cleanupIds[1655], $cleanupIds[1656], $cleanupIds[1657], $cleanupIds[1658], $cleanupIds[1659], $cleanupIds[1660], $cleanupIds[1661], $cleanupIds[1662], $cleanupIds[1663], $cleanupIds[1664], $cleanupIds[1665], $cleanupIds[1666], $cleanupIds[1667], $cleanupIds[1668], $cleanupIds[1669], $cleanupIds[1670], $cleanupIds[1671], $cleanupIds[1672], $cleanupIds[1673], $cleanupIds[1674], $cleanupIds[1675], $cleanupIds[1676], $cleanupIds[1677], $cleanupIds[1678], $cleanupIds[1679], $cleanupIds[1680], $cleanupIds[1681], $cleanupIds[1682], $cleanupIds[1683], $cleanupIds[1684], $cleanupIds[1685], $cleanupIds[1686], $cleanupIds[1687], $cleanupIds[1688], $cleanupIds[1689], $cleanupIds[1690], $cleanupIds[1691], $cleanupIds[1692], $cleanupIds[1693], $cleanupIds[1694], $cleanupIds[1695], $cleanupIds[1696], $cleanupIds[1697], $cleanupIds[1698], $cleanupIds[1699], $cleanupIds[1700], $cleanupIds[1701], $cleanupIds[1702], $cleanupIds[1703], $cleanupIds[1704], $cleanupIds[1705], $cleanupIds[1706], $cleanupIds[1707], $cleanupIds[1708], $cleanupIds[1709], $cleanupIds[1710], $cleanupIds[1711], $cleanupIds[1712], $cleanupIds[1713], $cleanupIds[1714], $cleanupIds[1715], $cleanupIds[1716], $cleanupIds[1717], $cleanupIds[1718], $cleanupIds[1719], $cleanupIds[1720], $cleanupIds[1721], $cleanupIds[1722], $cleanupIds[1723], $cleanupIds[1724], $cleanupIds[1725], $cleanupIds[1726], $cleanupIds[1727], $cleanupIds[1728], $cleanupIds[1729], $cleanupIds[1730], $cleanupIds[1731], $cleanupIds[1732], $cleanupIds[1733], $cleanupIds[1734], $cleanupIds[1735], $cleanupIds[1736], $cleanupIds[1737], $cleanupIds[1738], $cleanupIds[1739], $cleanupIds[1740], $cleanupIds[1741], $cleanupIds[1742], $cleanupIds[1743], $cleanupIds[1744], $cleanupIds[1745], $cleanupIds[1746], $cleanupIds[1747], $cleanupIds[1748], $cleanupIds[1749], $cleanupIds[1750], $cleanupIds[1751], $cleanupIds[1752], $cleanupIds[1753], $cleanupIds[1754], $cleanupIds[1755], $cleanupIds[1756], $cleanupIds[1757], $cleanupIds[1758], $cleanupIds[1759], $cleanupIds[1760], $cleanupIds[1761], $cleanupIds[1762], $cleanupIds[1763], $cleanupIds[1764], $cleanupIds[1765], $cleanupIds[1766], $cleanupIds[1767], $cleanupIds[1768], $cleanupIds[1769], $cleanupIds[1770], $cleanupIds[1771], $cleanupIds[1772], $cleanupIds[1773], $cleanupIds[1774], $cleanupIds[1775], $cleanupIds[1776], $cleanupIds[1777], $cleanupIds[1778], $cleanupIds[1779], $cleanupIds[1780], $cleanupIds[1781], $cleanupIds[1782], $cleanupIds[1783], $cleanupIds[1784], $cleanupIds[1785], $cleanupIds[1786], $cleanupIds[1787], $cleanupIds[1788], $cleanupIds[1789], $cleanupIds[1790], $cleanupIds[1791], $cleanupIds[1792], $cleanupIds[1793], $cleanupIds[1794], $cleanupIds[1795], $cleanupIds[1796], $cleanupIds[1797], $cleanupIds[1798], $cleanupIds[1799], $cleanupIds[1800], $cleanupIds[1801], $cleanupIds[1802], $cleanupIds[1803], $cleanupIds[1804], $cleanupIds[1805], $cleanupIds[1806], $cleanupIds[1807], $cleanupIds[1808], $cleanupIds[1809], $cleanupIds[1810], $cleanupIds[1811], $cleanupIds[1812], $cleanupIds[1813], $cleanupIds[1814], $cleanupIds[1815], $cleanupIds[1816], $cleanupIds[1817], $cleanupIds[1818], $cleanupIds[1819], $cleanupIds[1820], $cleanupIds[1821], $cleanupIds[1822], $cleanupIds[1823], $cleanupIds[1824], $cleanupIds[1825], $cleanupIds[1826], $cleanupIds[1827], $cleanupIds[1828], $cleanupIds[1829], $cleanupIds[1830], $cleanupIds[1831], $cleanupIds[1832], $cleanupIds[1833], $cleanupIds[1834], $cleanupIds[1835], $cleanupIds[1836], $cleanupIds[1837], $cleanupIds[1838], $cleanupIds[1839], $cleanupIds[1840], $cleanupIds[1841], $cleanupIds[1842], $cleanupIds[1843], $cleanupIds[1844], $cleanupIds[1845], $cleanupIds[1846], $cleanupIds[1847], $cleanupIds[1848], $cleanupIds[1849], $cleanupIds[1850], $cleanupIds[1851], $cleanupIds[1852], $cleanupIds[1853], $cleanupIds[1854], $cleanupIds[1855], $cleanupIds[1856], $cleanupIds[1857], $cleanupIds[1858], $cleanupIds[1859], $cleanupIds[1860], $cleanupIds[1861], $cleanupIds[1862], $cleanupIds[1863], $cleanupIds[1864], $cleanupIds[1865], $cleanupIds[1866], $cleanupIds[1867], $cleanupIds[1868], $cleanupIds[1869], $cleanupIds[1870], $cleanupIds[1871], $cleanupIds[1872], $cleanupIds[1873], $cleanupIds[1874], $cleanupIds[1875], $cleanupIds[1876], $cleanupIds[1877], $cleanupIds[1878], $cleanupIds[1879], $cleanupIds[1880], $cleanupIds[1881], $cleanupIds[1882], $cleanupIds[1883], $cleanupIds[1884], $cleanupIds[1885], $cleanupIds[1886], $cleanupIds[1887], $cleanupIds[1888], $cleanupIds[1889], $cleanupIds[1890], $cleanupIds[1891], $cleanupIds[1892], $cleanupIds[1893], $cleanupIds[1894], $cleanupIds[1895], $cleanupIds[1896], $cleanupIds[1897], $cleanupIds[1898], $cleanupIds[1899], $cleanupIds[1900], $cleanupIds[1901], $cleanupIds[1902], $cleanupIds[1903], $cleanupIds[1904], $cleanupIds[1905], $cleanupIds[1906], $cleanupIds[1907], $cleanupIds[1908], $cleanupIds[1909], $cleanupIds[1910], $cleanupIds[1911], $cleanupIds[1912], $cleanupIds[1913], $cleanupIds[1914], $cleanupIds[1915], $cleanupIds[1916], $cleanupIds[1917], $cleanupIds[1918], $cleanupIds[1919], $cleanupIds[1920], $cleanupIds[1921], $cleanupIds[1922], $cleanupIds[1923], $cleanupIds[1924], $cleanupIds[1925], $cleanupIds[1926], $cleanupIds[1927], $cleanupIds[1928], $cleanupIds[1929], $cleanupIds[1930], $cleanupIds[1931], $cleanupIds[1932], $cleanupIds[1933], $cleanupIds[1934], $cleanupIds[1935], $cleanupIds[1936], $cleanupIds[1937], $cleanupIds[1938], $cleanupIds[1939], $cleanupIds[1940], $cleanupIds[1941], $cleanupIds[1942], $cleanupIds[1943], $cleanupIds[1944], $cleanupIds[1945], $cleanupIds[1946], $cleanupIds[1947], $cleanupIds[1948], $cleanupIds[1949], $cleanupIds[1950], $cleanupIds[1951], $cleanupIds[1952], $cleanupIds[1953], $cleanupIds[1954], $cleanupIds[1955], $cleanupIds[1956], $cleanupIds[1957], $cleanupIds[1958], $cleanupIds[1959], $cleanupIds[1960], $cleanupIds[1961], $cleanupIds[1962], $cleanupIds[1963], $cleanupIds[1964], $cleanupIds[1965], $cleanupIds[1966], $cleanupIds[1967], $cleanupIds[1968], $cleanupIds[1969], $cleanupIds[1970], $cleanupIds[1971], $cleanupIds[1972], $cleanupIds[1973], $cleanupIds[1974], $cleanupIds[1975], $cleanupIds[1976], $cleanupIds[1977], $cleanupIds[1978], $cleanupIds[1979], $cleanupIds[1980], $cleanupIds[1981], $cleanupIds[1982], $cleanupIds[1983], $cleanupIds[1984], $cleanupIds[1985], $cleanupIds[1986], $cleanupIds[1987], $cleanupIds[1988], $cleanupIds[1989], $cleanupIds[1990], $cleanupIds[1991], $cleanupIds[1992], $cleanupIds[1993], $cleanupIds[1994], $cleanupIds[1995], $cleanupIds[1996], $cleanupIds[1997], $cleanupIds[1998], $cleanupIds[1999], $cleanupIds[2000], $cleanupIds[2001], $cleanupIds[2002], $cleanupIds[2003], $cleanupIds[2004], $cleanupIds[2005], $cleanupIds[2006]);
+
+    	/* execute query */
+    	$stmt->execute();
+
+		/* close statement */
+    	$stmt->close();
+	}
+
+	mysqli_close($link);
+	print "done!";
+?>
+--CLEAN--
+<?php
+	require_once("clean_table.inc");
+?>
+--EXPECTF--
+done!
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 90c2b73ea..843e52d38 100644
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -1061,7 +1061,7 @@ static enum_func_status
 MYSQLND_METHOD(mysqlnd_conn_data, send_query)(MYSQLND_CONN_DATA * conn, const char * query, unsigned int query_len TSRMLS_DC)
 {
 	size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, send_query);
-	enum_func_status ret;
+	enum_func_status ret = FAIL;
 	DBG_ENTER("mysqlnd_conn_data::send_query");
 	DBG_INF_FMT("conn=%llu query=%s", conn->thread_id, query);
 
@@ -1142,6 +1142,7 @@ MYSQLND ** mysqlnd_stream_array_check_for_readiness(MYSQLND ** conn_array TSRMLS
 static int mysqlnd_stream_array_to_fd_set(MYSQLND ** conn_array, fd_set * fds, php_socket_t * max_fd TSRMLS_DC)
 {
 	php_socket_t this_fd;
+	php_stream *stream = NULL;
 	int cnt = 0;
 	MYSQLND **p = conn_array;
 
@@ -1151,7 +1152,8 @@ static int mysqlnd_stream_array_to_fd_set(MYSQLND ** conn_array, fd_set * fds, p
 		 * when casting.  It is only used here so that the buffered data warning
 		 * is not displayed.
 		 * */
-		if (SUCCESS == php_stream_cast((*p)->data->net->stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL,
+		stream = (*p)->data->net->stream;
+		if (stream != NULL && SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL,
 										(void*)&this_fd, 1) && this_fd >= 0) {
 
 			PHP_SAFE_FD_SET(this_fd, fds);
@@ -1169,6 +1171,7 @@ static int mysqlnd_stream_array_to_fd_set(MYSQLND ** conn_array, fd_set * fds, p
 static int mysqlnd_stream_array_from_fd_set(MYSQLND ** conn_array, fd_set * fds TSRMLS_DC)
 {
 	php_socket_t this_fd;
+	php_stream *stream = NULL;
 	int ret = 0;
 	zend_bool disproportion = FALSE;
 
@@ -1176,7 +1179,8 @@ static int mysqlnd_stream_array_from_fd_set(MYSQLND ** conn_array, fd_set * fds
 	MYSQLND **fwd = conn_array, **bckwd = conn_array;
 
 	while (*fwd) {
-		if (SUCCESS == php_stream_cast((*fwd)->data->net->stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL,
+		stream = (*fwd)->data->net->stream;
+		if (stream != NULL && SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL,
 										(void*)&this_fd, 1) && this_fd >= 0) {
 			if (PHP_SAFE_FD_ISSET(this_fd, fds)) {
 				if (disproportion) {
@@ -1337,7 +1341,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, list_fields)(MYSQLND_CONN_DATA * conn, const c
 			}
 
 			if (FAIL == result->m.read_result_metadata(result, conn TSRMLS_CC)) {
-				DBG_ERR("Error ocurred while reading metadata");
+				DBG_ERR("Error occurred while reading metadata");
 				result->m.free_result(result, TRUE TSRMLS_CC);
 				result = NULL;
 				break;
@@ -1468,7 +1472,7 @@ static ulong
 MYSQLND_METHOD(mysqlnd_conn_data, escape_string)(MYSQLND_CONN_DATA * const conn, char * newstr, const char * escapestr, size_t escapestr_len TSRMLS_DC)
 {
 	size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, escape_string);
-	ulong ret;
+	ulong ret = FAIL;
 	DBG_ENTER("mysqlnd_conn_data::escape_string");
 	DBG_INF_FMT("conn=%llu", conn->thread_id);
 
diff --git a/ext/mysqlnd/mysqlnd_net.c b/ext/mysqlnd/mysqlnd_net.c
index 21241b3ef..77e119641 100644
--- a/ext/mysqlnd/mysqlnd_net.c
+++ b/ext/mysqlnd/mysqlnd_net.c
@@ -758,7 +758,7 @@ MYSQLND_METHOD(mysqlnd_net, consume_uneaten_data)(MYSQLND_NET * const net, enum
 	/*
 	  Switch to non-blocking mode and try to consume something from
 	  the line, if possible, then continue. This saves us from looking for
-	  the actuall place where out-of-order packets have been sent.
+	  the actual place where out-of-order packets have been sent.
 	  If someone is completely sure that everything is fine, he can switch it
 	  off.
 	*/
diff --git a/ext/mysqlnd/mysqlnd_ps_codec.c b/ext/mysqlnd/mysqlnd_ps_codec.c
index 5ead1b0bc..cee0be181 100644
--- a/ext/mysqlnd/mysqlnd_ps_codec.c
+++ b/ext/mysqlnd/mysqlnd_ps_codec.c
@@ -626,6 +626,7 @@ mysqlnd_stmt_execute_store_params(MYSQLND_STMT * s, zend_uchar **buf, zend_uchar
 		*p += null_count;
 	}
 
+	left = (*buf_len - (*p - *buf));
 /* 1. Store type information */
 	/*
 	  check if need to send the types even if stmt->send_types_to_server is 0. This is because
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index 2e289062a..fd2023cd1 100644
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -497,7 +497,7 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s
 						mnd_efree(conn->current_result);
 						conn->current_result = NULL;
 					}
-					DBG_ERR("Error ocurred while reading metadata");
+					DBG_ERR("Error occurred while reading metadata");
 					break;
 				}
 
@@ -509,7 +509,7 @@ mysqlnd_query_read_result_set_header(MYSQLND_CONN_DATA * conn, MYSQLND_STMT * s
 					break;
 				}
 				if (FAIL == (ret = PACKET_READ(fields_eof, conn))) {
-					DBG_ERR("Error ocurred while reading the EOF packet");
+					DBG_ERR("Error occurred while reading the EOF packet");
 					result->m.free_result_contents(result TSRMLS_CC);
 					mnd_efree(result);
 					if (!stmt) {
@@ -1510,6 +1510,7 @@ MYSQLND_METHOD(mysqlnd_res, fetch_into)(MYSQLND_RES * result, unsigned int flags
 	mysqlnd_array_init(return_value, mysqlnd_num_fields(result) * 2);
 	if (FAIL == result->m.fetch_row(result, (void *)return_value, flags, &fetched_anything TSRMLS_CC)) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error while reading a row");
+		zval_dtor(return_value);
 		RETVAL_FALSE;
 	} else if (fetched_anything == FALSE) {
 		zval_dtor(return_value);
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index 00566b1b6..c51d216f3 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -831,7 +831,7 @@ Fixed bug #36820 (Privileged connection with an Oracle password file fails)
    <date>2006-03-16</date>
    <license uri="http://www.php.net/license">PHP</license>
    <notes>Changed OCI8 code to use OCIServerVersion() instead of OCIPing(), which may crash Oracle server of version &lt; 10.2
-Fixed bug #36235 (ocicolumnname returns false before a succesfull fetch)
+Fixed bug #36235 (ocicolumnname returns false before a successfull fetch)
 Fixed bug #36096 (oci_result() returns garbage after oci_fetch() failed)
 Fixed bug #36055 (possible OCI8 crash in multithreaded environment)
 Fixed bug #36010 (Segfault when re-creating and re-executing statements with bound parameters)
diff --git a/ext/oci8/tests/bug43492_2.phpt b/ext/oci8/tests/bug43492_2.phpt
index 61511cf6d..d735f6429 100644
--- a/ext/oci8/tests/bug43492_2.phpt
+++ b/ext/oci8/tests/bug43492_2.phpt
@@ -8,7 +8,7 @@ require(dirname(__FILE__).'/skipif.inc');
 --FILE--
 <?php
 
-// This test is similar to bug43492.phpt without the explict free.
+// This test is similar to bug43492.phpt without the explicit free.
 // Now that bug 44206 is fixed an automatic clean up will occur -
 // though it is still recommended in practice.
 
diff --git a/ext/oci8/tests/conn_attr.inc b/ext/oci8/tests/conn_attr.inc
index 2c086b189..220e68821 100644
--- a/ext/oci8/tests/conn_attr.inc
+++ b/ext/oci8/tests/conn_attr.inc
@@ -98,7 +98,7 @@ function set_attr($conn,$attr,$sufix)
 	else if (!strcmp($attr,'CLIENT_IDENTIFIER')) 
         $r = oci_set_client_identifier($conn,'ID00'.$sufix);
 	else
-		echo "Pass one of the above four attibutes!!!\n";
+		echo "Pass one of the above four attributes!!!\n";
 	if ($r) {
 		echo "Value of $attr has been set successfully\n";
     }
diff --git a/ext/oci8/tests/conn_attr_4.phpt b/ext/oci8/tests/conn_attr_4.phpt
index d15b7a38d..4885f80b7 100644
--- a/ext/oci8/tests/conn_attr_4.phpt
+++ b/ext/oci8/tests/conn_attr_4.phpt
@@ -62,7 +62,7 @@ foreach($values_array as $val ) {
 	oci_set_client_info($c1,$val);
 	$r = oci_set_action($c1,$val);	
 	if ($r) {
-		echo "Values set succesfully to $val\n";
+		echo "Values set successfully to $val\n";
 		foreach($attr_array as $attr) {
             get_attr($c1,$attr);
         }
@@ -98,12 +98,12 @@ bool(true)
 The value of ACTION is ACTION1
 
 Setting to different values 
-Values set succesfully to 1000
+Values set successfully to 1000
 The value of MODULE is 1000
 The value of ACTION is 1000
 The value of CLIENT_INFO is 1000
 The value of CLIENT_IDENTIFIER is 1000
-Values set succesfully to 
+Values set successfully to 
 The value of MODULE is 
 The value of ACTION is 
 The value of CLIENT_INFO is 
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 5be3288f3..a1201db57 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -370,18 +370,33 @@ PHP_ARG_WITH(iodbc,,
 
   if test "$PHP_IODBC" != "no"; then
     AC_MSG_CHECKING(for iODBC support)
-    if test "$PHP_IODBC" = "yes"; then
-      PHP_IODBC=/usr/local
+    if test -z "$PKG_CONFIG"; then
+      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+    fi 
+    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
+      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
+      ODBC_TYPE=iodbc
+      ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
+      ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
+      ODBC_LIBS=`$PKG_CONFIG --libs-only-l libiodbc`
+      PHP_EVAL_INCLINE($ODBC_INCLUDE)
+      AC_DEFINE(HAVE_IODBC,1,[ ])
+      AC_DEFINE(HAVE_ODBC2,1,[ ])
+      AC_MSG_RESULT([$ext_output])
+    else
+      if test "$PHP_IODBC" = "yes"; then
+        PHP_IODBC=/usr/local
+      fi
+      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
+      PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
+      ODBC_TYPE=iodbc
+      ODBC_INCLUDE=-I$PHP_IODBC/include
+      ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
+      ODBC_LIBS=-liodbc
+      AC_DEFINE(HAVE_IODBC,1,[ ])
+      AC_DEFINE(HAVE_ODBC2,1,[ ])
+      AC_MSG_RESULT([$ext_output])
     fi
-    PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
-    PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
-    ODBC_TYPE=iodbc
-    ODBC_INCLUDE=-I$PHP_IODBC/include
-    ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
-    ODBC_LIBS=-liodbc
-    AC_DEFINE(HAVE_IODBC,1,[ ])
-    AC_DEFINE(HAVE_ODBC2,1,[ ])
-    AC_MSG_RESULT([$ext_output])
   fi
 fi
 
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index adb7272d4..c84a4ecc6 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -1765,7 +1765,7 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
 		if (result_type & ODBC_NUM) {
 			zend_hash_index_update(Z_ARRVAL_P(return_value), i, &tmp, sizeof(zval *), NULL);
 		} else {
-			if (!*(result->values[i].name)) {
+			if (!*(result->values[i].name) && Z_TYPE_P(tmp) == IS_STRING) {
 				zend_hash_update(Z_ARRVAL_P(return_value), Z_STRVAL_P(tmp),	Z_STRLEN_P(tmp)+1, &tmp, sizeof(zval *), NULL);
 			} else {
 				zend_hash_update(Z_ARRVAL_P(return_value), result->values[i].name, strlen(result->values[i].name)+1, &tmp, sizeof(zval *), NULL);
@@ -2704,7 +2704,7 @@ PHP_FUNCTION(odbc_num_rows)
 
 #if !defined(HAVE_SOLID) && !defined(HAVE_SOLID_30)
 /* {{{ proto bool odbc_next_result(resource result_id)
-   Checks if multiple results are avaiable */
+   Checks if multiple results are available */
 PHP_FUNCTION(odbc_next_result)
 {
 	odbc_result *result;
diff --git a/ext/odbc/php_odbc_includes.h b/ext/odbc/php_odbc_includes.h
index 8251528e1..ca237c053 100644
--- a/ext/odbc/php_odbc_includes.h
+++ b/ext/odbc/php_odbc_includes.h
@@ -161,7 +161,7 @@ PHP_FUNCTION(solid_fetch_prev);
 #define UNIX
 /*
  * Extended Fetch in the Birdstep ODBC API is incapable of returning long varchar (memo) fields.
- * So the following line has been commented-out to accomadate. - KNS
+ * So the following line has been commented-out to accommodate. - KNS
  *
  * #define HAVE_SQL_EXTENDED_FETCH 1
  */
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index d7ac117e5..f1dfa5024 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -561,6 +561,7 @@ static EVP_PKEY * php_openssl_generate_private_key(struct php_x509_request * req
 
 static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int shortname TSRMLS_DC) /* {{{ */
 {
+	zval **data;
 	zval *subitem, *subentries;
 	int i, j = -1, last = -1, obj_cnt = 0;
 	char *sname;
@@ -578,7 +579,7 @@ static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int s
 
 	for (i = 0; i < X509_NAME_entry_count(name); i++) {
 		unsigned char *to_add;
-		int to_add_len;
+		int to_add_len = 0;
 
 
 		ne  = X509_NAME_get_entry(name, i);
@@ -592,39 +593,27 @@ static void add_assoc_name_entry(zval * val, char * key, X509_NAME * name, int s
 			sname = (char *) OBJ_nid2ln(nid);
 		}
 
-		MAKE_STD_ZVAL(subentries);
-		array_init(subentries);
+		str = X509_NAME_ENTRY_get_data(ne);
+		if (ASN1_STRING_type(str) != V_ASN1_UTF8STRING) {
+			to_add_len = ASN1_STRING_to_UTF8(&to_add, str);
+		} else {
+			to_add = ASN1_STRING_data(str);
+			to_add_len = ASN1_STRING_length(str);
+		}
 
-		last = -1;
-		for (;;) {
-			j = X509_NAME_get_index_by_OBJ(name, obj, last);
-			if (j < 0) {
-				if (last != -1) break;
-			} else {
-				obj_cnt++;
-				ne  = X509_NAME_get_entry(name, j);
-				str = X509_NAME_ENTRY_get_data(ne);
-				if (ASN1_STRING_type(str) != V_ASN1_UTF8STRING) {
-					to_add_len = ASN1_STRING_to_UTF8(&to_add, str);
-					if (to_add_len != -1) {
-						add_next_index_stringl(subentries, (char *)to_add, to_add_len, 1);
-					}
-				} else {
-					to_add = ASN1_STRING_data(str);
-					to_add_len = ASN1_STRING_length(str);
+		if (to_add_len != -1) {
+			if (zend_hash_find(Z_ARRVAL_P(subitem), sname, strlen(sname)+1, (void**)&data) == SUCCESS) {
+				if (Z_TYPE_PP(data) == IS_ARRAY) {
+					subentries = *data;
+					add_next_index_stringl(subentries, (char *)to_add, to_add_len, 1);
+				} else if (Z_TYPE_PP(data) == IS_STRING) {
+					MAKE_STD_ZVAL(subentries);
+					array_init(subentries);
+					add_next_index_stringl(subentries, Z_STRVAL_PP(data), Z_STRLEN_PP(data), 1);
 					add_next_index_stringl(subentries, (char *)to_add, to_add_len, 1);
+					zend_hash_update(Z_ARRVAL_P(subitem), sname, strlen(sname)+1, &subentries, sizeof(zval*), NULL);
 				}
-			}
-			last = j;
-		}
-		i = last;
-
-		if (obj_cnt > 1) {
-			add_assoc_zval_ex(subitem, sname, strlen(sname) + 1, subentries);
-		} else {
-			zval_dtor(subentries);
-			FREE_ZVAL(subentries);
-			if (obj_cnt && str && to_add_len > -1) {
+			} else {
 				add_assoc_stringl(subitem, sname, (char *)to_add, to_add_len, 1);
 			}
 		}
@@ -1398,6 +1387,74 @@ PHP_FUNCTION(openssl_x509_check_private_key)
 }
 /* }}} */
 
+/* Special handling of subjectAltName, see CVE-2013-4073
+ * Christian Heimes
+ */
+
+static int openssl_x509v3_subjectAltName(BIO *bio, X509_EXTENSION *extension)
+{
+	GENERAL_NAMES *names;
+	const X509V3_EXT_METHOD *method = NULL;
+	long i, length, num;
+	const unsigned char *p;
+
+	method = X509V3_EXT_get(extension);
+	if (method == NULL) {
+		return -1;
+	}
+
+	p = extension->value->data;
+	length = extension->value->length;
+	if (method->it) {
+		names = (GENERAL_NAMES*)(ASN1_item_d2i(NULL, &p, length,
+						       ASN1_ITEM_ptr(method->it)));
+	} else {
+		names = (GENERAL_NAMES*)(method->d2i(NULL, &p, length));
+	}
+	if (names == NULL) {
+		return -1;
+	}
+
+	num = sk_GENERAL_NAME_num(names);
+	for (i = 0; i < num; i++) {
+			GENERAL_NAME *name;
+			ASN1_STRING *as;
+			name = sk_GENERAL_NAME_value(names, i);
+			switch (name->type) {
+				case GEN_EMAIL:
+					BIO_puts(bio, "email:");
+					as = name->d.rfc822Name;
+					BIO_write(bio, ASN1_STRING_data(as),
+						  ASN1_STRING_length(as));
+					break;
+				case GEN_DNS:
+					BIO_puts(bio, "DNS:");
+					as = name->d.dNSName;
+					BIO_write(bio, ASN1_STRING_data(as),
+						  ASN1_STRING_length(as));
+					break;
+				case GEN_URI:
+					BIO_puts(bio, "URI:");
+					as = name->d.uniformResourceIdentifier;
+					BIO_write(bio, ASN1_STRING_data(as),
+						  ASN1_STRING_length(as));
+					break;
+				default:
+					/* use builtin print for GEN_OTHERNAME, GEN_X400,
+					 * GEN_EDIPARTY, GEN_DIRNAME, GEN_IPADD and GEN_RID
+					 */
+					GENERAL_NAME_print(bio, name);
+			}
+			/* trailing ', ' except for last element */
+			if (i < (num - 1)) {
+				BIO_puts(bio, ", ");
+			}
+	}
+	sk_GENERAL_NAME_pop_free(names, GENERAL_NAME_free);
+
+	return 0;
+}
+
 /* {{{ proto array openssl_x509_parse(mixed x509 [, bool shortnames=true])
    Returns an array of the fields/values of the CERT */
 PHP_FUNCTION(openssl_x509_parse)
@@ -1494,15 +1551,30 @@ PHP_FUNCTION(openssl_x509_parse)
 
 
 	for (i = 0; i < X509_get_ext_count(cert); i++) {
+		int nid;
 		extension = X509_get_ext(cert, i);
-		if (OBJ_obj2nid(X509_EXTENSION_get_object(extension)) != NID_undef) {
+		nid = OBJ_obj2nid(X509_EXTENSION_get_object(extension));
+		if (nid != NID_undef) {
 			extname = (char *)OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(extension)));
 		} else {
 			OBJ_obj2txt(buf, sizeof(buf)-1, X509_EXTENSION_get_object(extension), 1);
 			extname = buf;
 		}
 		bio_out = BIO_new(BIO_s_mem());
-		if (X509V3_EXT_print(bio_out, extension, 0, 0)) {
+		if (nid == NID_subject_alt_name) {
+			if (openssl_x509v3_subjectAltName(bio_out, extension) == 0) {
+				BIO_get_mem_ptr(bio_out, &bio_buf);
+				add_assoc_stringl(subitem, extname, bio_buf->data, bio_buf->length, 1);
+			} else {
+				zval_dtor(return_value);
+				if (certresource == -1 && cert) {
+					X509_free(cert);
+				}
+				BIO_free(bio_out);
+				RETURN_FALSE;
+			}
+		}
+		else if (X509V3_EXT_print(bio_out, extension, 0, 0)) {
 			BIO_get_mem_ptr(bio_out, &bio_buf);
 			add_assoc_stringl(subitem, extname, bio_buf->data, bio_buf->length, 1);
 		} else {
diff --git a/ext/openssl/tests/bug64802.pem b/ext/openssl/tests/bug64802.pem
new file mode 100644
index 000000000..187cda31d
--- /dev/null
+++ b/ext/openssl/tests/bug64802.pem
@@ -0,0 +1,37 @@
+-----BEGIN CERTIFICATE-----
+MIIGfzCCBWegAwIBAgIQSVCinGH6MkvjJZjRyjK9nTANBgkqhkiG9w0BAQUFADCB
+jjELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxNDAyBgNV
+BAMTK0NPTU9ETyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0Ew
+HhcNMTIwMjI5MDAwMDAwWhcNMTQwMjI4MjM1OTU5WjCCAW8xEjAQBgNVBAMTCXd3
+dy5yZC5pbzERMA8GA1UEAxMIcmRpby5jb20xDjAMBgNVBAMTBXJkLmlvMRUwEwYD
+VQQDEwxhcGkucmRpby5jb20xEjAQBgNVBAMTCWFwaS5yZC5pbzEQMA4GA1UEBRMH
+NDU4NjAwNzETMBEGCysGAQQBgjc8AgEDEwJVUzEZMBcGCysGAQQBgjc8AgECEwhE
+ZWxhd2FyZTEdMBsGA1UEDxMUUHJpdmF0ZSBPcmdhbml6YXRpb24xCzAJBgNVBAYT
+AlVTMQ4wDAYDVQQREwU5NDEwMzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBG
+cmFuY2lzY28xFzAVBgNVBAkTDjE1NTAgQnJ5YW50IHN0MRMwEQYDVQQKEwpSZGlv
+LCBJbmMuMSMwIQYDVQQLExpDT01PRE8gRVYgTXVsdGktRG9tYWluIFNTTDEVMBMG
+A1UEAxMMd3d3LnJkaW8uY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAt0AgYOe8EBJNVBAuSJFLKHRKZn0/ObCLBFG4xVH/5fb1rfYHBT1XSjjOqR3t
+iGC/A3esF8YC7TuHQcTLVephx0DtJv1ASxRg3zPM8ebBRsuul18N0W+sY1aNXpkd
+36quxvjg5UdBrAweuekJ7OTSZcCe2Ry/SKBeZSWWtkWsI4krCLv7JaKUwxw2h+Hn
+TAZSBLVxz/mixF0WYdepYwnq2Hm7XvvVEIQ7wxOQ9bA7iCevLojZOnb39BT2QII7
+cy8AB47RZdfYg7UwaO3bST2rauA4MKar7/Ozqc0aemNFpLatJfgv07cydiuj9fsd
+5aE/c8is8C9M9+7MmSMkcNEgGwIDAQABo4IB8zCCAe8wHwYDVR0jBBgwFoAUiERR
+/1AqaV4tiPQhutkM8s7L6nwwHQYDVR0OBBYEFCrYw8bfrYJ61NS2yYx6/CnhjzT4
+MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
+BwMBBggrBgEFBQcDAjBGBgNVHSAEPzA9MDsGDCsGAQQBsjEBAgEFATArMCkGCCsG
+AQUFBwIBFh1odHRwczovL3NlY3VyZS5jb21vZG8uY29tL0NQUzBTBgNVHR8ETDBK
+MEigRqBEhkJodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9FeHRlbmRlZFZh
+bGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5jcmwwgYQGCCsGAQUFBwEBBHgwdjBOBggr
+BgEFBQcwAoZCaHR0cDovL2NydC5jb21vZG9jYS5jb20vQ09NT0RPRXh0ZW5kZWRW
+YWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8v
+b2NzcC5jb21vZG9jYS5jb20wTAYDVR0RBEUwQ4IMd3d3LnJkaW8uY29tgglhcGku
+cmQuaW+CDGFwaS5yZGlvLmNvbYIFcmQuaW+CCHJkaW8uY29tggl3d3cucmQuaW8w
+DQYJKoZIhvcNAQEFBQADggEBAKFd4bPVFRyrlqIKPtrtMuqGqid6685ohxf0cv52
+sjdRYwLVTjnZOrmkDdNaF3R2A1ZlVMRN+67rK+qfY5sTeijFcudV3/i0PDtOFRwP
+6yYVD2uZmYkxfPiW309HPmDF+EzhxpVjWlTQEOwkfFLTmJmwl3Qu2Kffp8F1ENXW
+OTVNvj5VtMghvzu68PpzKl1VjlOR4Ej9NCwh1dUjNKEoTPzvpehXsIZ7jHSpX/T1
+wSSt9ckiechDdpgZXTzHgbxHNibK0Uhh+QhkBgYMj5F8qj5BlBhWAWqQa/VnEdmr
+Pfo7U+QmadoqQd7qt06hE2hG1nfZ0vPJDbWV3oVSwG2Yt7I=
+-----END CERTIFICATE-----
diff --git a/ext/openssl/tests/bug64802.phpt b/ext/openssl/tests/bug64802.phpt
new file mode 100644
index 000000000..9a5970149
--- /dev/null
+++ b/ext/openssl/tests/bug64802.phpt
@@ -0,0 +1,56 @@
+--TEST--
+Bug #64802: openssl_x509_parse fails to parse subject properly in some cases
+--SKIPIF--
+<?php
+if (!extension_loaded("openssl")) die("skip");
+?>
+--FILE--
+<?php
+$cert = file_get_contents(__DIR__.'/bug64802.pem');
+$r = openssl_x509_parse($cert,$use_short_names=true);
+sort($r['subject']);
+var_dump( $r['subject'] );
+?>
+--EXPECTF--
+array(11) {
+  [0]=>
+  string(14) "1550 Bryant st"
+  [1]=>
+  string(5) "94103"
+  [2]=>
+  string(7) "4586007"
+  [3]=>
+  string(2) "CA"
+  [4]=>
+  string(26) "COMODO EV Multi-Domain SSL"
+  [5]=>
+  string(20) "Private Organization"
+  [6]=>
+  string(10) "Rdio, Inc."
+  [7]=>
+  string(13) "San Francisco"
+  [8]=>
+  string(2) "US"
+  [9]=>
+  array(2) {
+    [0]=>
+    string(2) "US"
+    [1]=>
+    string(8) "Delaware"
+  }
+  [10]=>
+  array(6) {
+    [0]=>
+    string(9) "www.rd.io"
+    [1]=>
+    string(8) "rdio.com"
+    [2]=>
+    string(5) "rd.io"
+    [3]=>
+    string(12) "api.rdio.com"
+    [4]=>
+    string(9) "api.rd.io"
+    [5]=>
+    string(12) "www.rdio.com"
+  }
+}
diff --git a/ext/openssl/tests/cve2013_4073.pem b/ext/openssl/tests/cve2013_4073.pem
new file mode 100644
index 000000000..7ebb99492
--- /dev/null
+++ b/ext/openssl/tests/cve2013_4073.pem
@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----
+MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx
+DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ
+eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg
+RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y
+ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw
+NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI
+DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv
+ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt
+ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq
+hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j
+pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P
+vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv
+KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA
+oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL
+08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV
+HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E
+BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu
+Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251
+bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA
+AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9
+i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j
+HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk
+kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx
+VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW
+RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ=
+-----END CERTIFICATE-----
diff --git a/ext/openssl/tests/cve2013_4073.phpt b/ext/openssl/tests/cve2013_4073.phpt
new file mode 100644
index 000000000..e676ddfb9
--- /dev/null
+++ b/ext/openssl/tests/cve2013_4073.phpt
@@ -0,0 +1,19 @@
+--TEST--
+CVE 2013-4073: Null-byte certificate handling
+--SKIPIF--
+<?php 
+if (!extension_loaded("openssl")) die("skip");
+--FILE--
+<?php
+$cert = file_get_contents(__DIR__ . '/cve2013_4073.pem');
+$info = openssl_x509_parse($cert);
+var_export($info['extensions']);
+
+--EXPECTF--
+array (
+  'basicConstraints' => 'CA:FALSE',
+  'subjectKeyIdentifier' => '88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C',
+  'keyUsage' => 'Digital Signature, Non Repudiation, Key Encipherment',
+  'subjectAltName' => 'DNS:altnull.python.org' . "\0" . 'example.com, email:null@python.org' . "\0" . 'user@example.org, URI:http://null.python.org' . "\0" . 'http://example.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1
+',
+)
diff --git a/ext/openssl/tests/openssl.cnf b/ext/openssl/tests/openssl.cnf
index 10e69076c..4ed40fdc8 100644
--- a/ext/openssl/tests/openssl.cnf
+++ b/ext/openssl/tests/openssl.cnf
@@ -3,7 +3,7 @@ default_bits		= 1024
 default_keyfile 	= privkey.pem
 distinguished_name	= req_distinguished_name
 attributes		= req_attributes
-x509_extensions	= v3_ca	# The extentions to add to the self signed cert
+x509_extensions	= v3_ca	# The extensions to add to the self signed cert
 string_mask = MASK:4294967295
 
 
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 0e1523853..6e74d8024 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -274,7 +274,7 @@ static int php_openssl_sockop_close(php_stream *stream, int close_handle TSRMLS_
 			 * Essentially, we are waiting for the socket to become writeable, which means
 			 * that all pending data has been sent.
 			 * We use a small timeout which should encourage the OS to send the data,
-			 * but at the same time avoid hanging indefintely.
+			 * but at the same time avoid hanging indefinitely.
 			 * */
 			do {
 				n = php_pollfd_for_ms(sslsock->s.socket, POLLOUT, 500);
@@ -472,7 +472,7 @@ static inline int php_openssl_enable_crypto(php_stream *stream,
 		
 		do {
 			struct timeval	cur_time,
-							elapsed_time;
+							elapsed_time = {0};
 			
 			if (sslsock->is_client) {
 				n = SSL_connect(sslsock->ssl_handle);
diff --git a/ext/pcntl/php_signal.c b/ext/pcntl/php_signal.c
index 7e123a1ac..b3cccac44 100644
--- a/ext/pcntl/php_signal.c
+++ b/ext/pcntl/php_signal.c
@@ -23,7 +23,7 @@
 #include "Zend/zend.h"
 #include "Zend/zend_signal.h"
 
-/* php_signal using sigaction is derrived from Advanced Programing
+/* php_signal using sigaction is derived from Advanced Programing
  * in the Unix Environment by W. Richard Stevens p 298. */
 Sigfunc *php_signal4(int signo, Sigfunc *func, int restart, int mask_all)
 {
diff --git a/ext/pcntl/tests/pcntl_exec.phpt b/ext/pcntl/tests/pcntl_exec.phpt
index 9d2ec1dcf..9a2c96ea3 100644
--- a/ext/pcntl/tests/pcntl_exec.phpt
+++ b/ext/pcntl/tests/pcntl_exec.phpt
@@ -8,7 +8,7 @@ if (!getenv("TEST_PHP_EXECUTABLE") || !is_executable(getenv("TEST_PHP_EXECUTABLE
 --FILE--
 <?php
 echo "ok\n";
-pcntl_exec(getenv("TEST_PHP_EXECUTABLE"));
+pcntl_exec(getenv("TEST_PHP_EXECUTABLE"), ['-n']);
 echo "nok\n";
 ?>
 --EXPECT--
diff --git a/ext/pcntl/tests/pcntl_exec_2.phpt b/ext/pcntl/tests/pcntl_exec_2.phpt
index 02b5e22aa..e18527dba 100644
--- a/ext/pcntl/tests/pcntl_exec_2.phpt
+++ b/ext/pcntl/tests/pcntl_exec_2.phpt
@@ -14,7 +14,7 @@ if (getenv("PCNTL_EXEC_TEST_IS_CHILD")) {
 	exit;
 }
 echo "ok\n";
-pcntl_exec(getenv("TEST_PHP_EXECUTABLE"), array(__FILE__), array(
+pcntl_exec(getenv("TEST_PHP_EXECUTABLE"), array('-n', __FILE__), array(
 	b"PCNTL_EXEC_TEST_IS_CHILD" => b"1", 
 	b"FOO" => b"BAR",
 	1 => b"long")
diff --git a/ext/pcre/pcrelib/ChangeLog b/ext/pcre/pcrelib/ChangeLog
index 1b016ecee..ed164fed0 100644
--- a/ext/pcre/pcrelib/ChangeLog
+++ b/ext/pcre/pcrelib/ChangeLog
@@ -1751,7 +1751,7 @@ Version 7.7 07-May-08
     containing () gave an internal compiling error instead of "reference to
     non-existent subpattern". Fortunately, when the pattern did exist, the
     compiled code was correct. (When scanning forwards to check for the
-    existencd of the subpattern, it was treating the data ']' as terminating
+    existence of the subpattern, it was treating the data ']' as terminating
     the class, so got the count wrong. When actually compiling, the reference
     was subsequently set up correctly.)
 
diff --git a/ext/pcre/pcrelib/NEWS b/ext/pcre/pcrelib/NEWS
index ebd9c5ec9..082139f22 100644
--- a/ext/pcre/pcrelib/NEWS
+++ b/ext/pcre/pcrelib/NEWS
@@ -591,7 +591,7 @@ some of the new functionality in Perl 5.005.
 Another (I hope this is the last!) change has been made to the API for the
 pcre_compile() function. An additional argument has been added to make it
 possible to pass over a pointer to character tables built in the current
-locale by pcre_maketables(). To use the default tables, this new arguement
+locale by pcre_maketables(). To use the default tables, this new argument
 should be passed as NULL.
 
           IMPORTANT FOR THOSE UPGRADING FROM VERSION 2.05
diff --git a/ext/pcre/pcrelib/pcre_compile.c b/ext/pcre/pcrelib/pcre_compile.c
index 5f0c8ed08..4997b3b1e 100644
--- a/ext/pcre/pcrelib/pcre_compile.c
+++ b/ext/pcre/pcrelib/pcre_compile.c
@@ -8139,7 +8139,7 @@ if (code - codestart > length) errorcode = ERR23;
 
 #ifdef SUPPORT_VALGRIND
 /* If the estimated length exceeds the really used length, mark the extra
-allocated memory as unadressable, so that any out-of-bound reads can be
+allocated memory as unaddressable, so that any out-of-bound reads can be
 detected. */
 VALGRIND_MAKE_MEM_NOACCESS(code, (length - (code - codestart)) * sizeof(pcre_uchar));
 #endif
diff --git a/ext/pcre/tests/preg_grep_error1.phpt b/ext/pcre/tests/preg_grep_error1.phpt
index 29dfc5af1..ae2eb128b 100644
--- a/ext/pcre/tests/preg_grep_error1.phpt
+++ b/ext/pcre/tests/preg_grep_error1.phpt
@@ -11,9 +11,9 @@ error_reporting(E_ALL&~E_NOTICE);
 * Testing how preg_grep reacts to being passed bad regexes
 */
 echo "*** Testing preg_grep() : error conditions ***\n";
-$values = array('abcdef', //Regex without delimeter
-'/[a-zA-Z]', //Regex without closing delimeter
-'[a-zA-Z]/', //Regex without opening delimeter
+$values = array('abcdef', //Regex without delimiter
+'/[a-zA-Z]', //Regex without closing delimiter
+'[a-zA-Z]/', //Regex without opening delimiter
 '/[a-zA-Z]/F', array('[a-z]', //Array of Regexes
 '[A-Z]', '[0-9]'), '/[a-zA-Z]/', //Regex string
 );
diff --git a/ext/pcre/tests/preg_match_all_error1.phpt b/ext/pcre/tests/preg_match_all_error1.phpt
index a3cb68404..95ab905d7 100644
--- a/ext/pcre/tests/preg_match_all_error1.phpt
+++ b/ext/pcre/tests/preg_match_all_error1.phpt
@@ -11,9 +11,9 @@ error_reporting(E_ALL&~E_NOTICE);
 * Testing how preg_match_all reacts to being passed the wrong type of regex argument
 */
 echo "*** Testing preg_match_all() : error conditions ***\n";
-$regex_array = array('abcdef', //Regex without delimeter
-'/[a-zA-Z]', //Regex without closing delimeter
-'[a-zA-Z]/', //Regex without opening delimeter
+$regex_array = array('abcdef', //Regex without delimiter
+'/[a-zA-Z]', //Regex without closing delimiter
+'[a-zA-Z]/', //Regex without opening delimiter
 '/[a-zA-Z]/F', array('[a-z]', //Array of Regexes
 '[A-Z]', '[0-9]'), '/[a-zA-Z]/', //Regex string
 );
diff --git a/ext/pcre/tests/preg_match_error1.phpt b/ext/pcre/tests/preg_match_error1.phpt
index 763048151..ec9cf8cec 100644
--- a/ext/pcre/tests/preg_match_error1.phpt
+++ b/ext/pcre/tests/preg_match_error1.phpt
@@ -11,9 +11,9 @@ error_reporting(E_ALL&~E_NOTICE);
 * Testing how preg_match reacts to being passed the wrong type of regex argument
 */
 echo "*** Testing preg_match() : error conditions ***\n";
-$regex_array = array('abcdef', //Regex without delimeter
-'/[a-zA-Z]', //Regex without closing delimeter
-'[a-zA-Z]/', //Regex without opening delimeter
+$regex_array = array('abcdef', //Regex without delimiter
+'/[a-zA-Z]', //Regex without closing delimiter
+'[a-zA-Z]/', //Regex without opening delimiter
 '/[a-zA-Z]/F', array('[a-z]', //Array of Regexes
 '[A-Z]', '[0-9]'), '/[a-zA-Z]/', //Regex string
 );
diff --git a/ext/pcre/tests/preg_replace_basic.phpt b/ext/pcre/tests/preg_replace_basic.phpt
index 33fb2d4a8..6962bce25 100644
--- a/ext/pcre/tests/preg_replace_basic.phpt
+++ b/ext/pcre/tests/preg_replace_basic.phpt
@@ -11,7 +11,7 @@ var_dump($string);
 var_dump(preg_replace('<- This is a string$>', 'This shouldn\'t work', $string)); //tries to find '- This is a string' at the end of a string but can't so replaces nothing and prints the unchanged $string.
 var_dump(preg_replace('<[0-35-9]>', '4', $string)); //finds any number that's not 4 and replaces it with a 4 ('444444444')
 var_dump(preg_replace('<\b[hH]\w{2,4}>', 'Bonjour', $string)); //finds h or H at the beginning of a word followed by 2-4 characters and replaces it with Bonjour (i.e. Hello -> Bonjour) (was finding the 'his' in This and replacing it)
-var_dump(preg_replace('<(\w)\s*-\s*(\w)>', '\\1. \\2', $string)); //finds dashes with an indefinate amount of whitespace around them and replaces them with a full stop precedeby no spaces and followed by one space
+var_dump(preg_replace('<(\w)\s*-\s*(\w)>', '\\1. \\2', $string)); //finds dashes with an indefinite amount of whitespace around them and replaces them with a full stop precedeby no spaces and followed by one space
 var_dump(preg_replace('<(^[a-z]\w+)@(\w+)\.(\w+)\.([a-z]{2,}$)>', '\\1 at \\2 dot \\3 dot \\4', 'josmessa@uk.ibm.com')); //finds the e-mail address and replaces the @ and . with "at" and "dot" (uses backreferences) ('josmessa at uk dot ibm dot com')
 
 ?>
diff --git a/ext/pcre/tests/preg_replace_edit_basic.phpt b/ext/pcre/tests/preg_replace_edit_basic.phpt
index 97350e756..556b48b8c 100644
--- a/ext/pcre/tests/preg_replace_edit_basic.phpt
+++ b/ext/pcre/tests/preg_replace_edit_basic.phpt
@@ -24,7 +24,7 @@ var_dump(preg_replace('<\b[hH]\w{2,4}>',
                       'Bonjour', $string));						//finds h or H at the beginning of a word followed by 2-4 characters and replaces it with Bonjour (i.e. Hello -> Bonjour) (was finding the 'his' in This and replacing it)
 
 var_dump(preg_replace('<(\w)\s*-\s*(\w)>',
-                      '\\1. \\2', $string));						//finds dashes with an indefinate amount of whitespace around them and replaces them with a full stop precedeby no spaces and followed by one space
+                      '\\1. \\2', $string));						//finds dashes with an indefinite amount of whitespace around them and replaces them with a full stop precedeby no spaces and followed by one space
 
 var_dump(preg_replace('<(^[a-z]\w+)@(\w+)\.(\w+)\.([a-z]{2,}$)>', 
                       '\\1 at \\2 dot \\3 dot \\4', 'josmessa@uk.ibm.com'));	//finds the e-mail address and replaces the @ and . with "at" and "dot" (uses backreferences) ('josmessa at uk dot ibm dot com')
diff --git a/ext/pcre/tests/preg_replace_error1.phpt b/ext/pcre/tests/preg_replace_error1.phpt
index 7ddfcfdef..ec573c77b 100644
--- a/ext/pcre/tests/preg_replace_error1.phpt
+++ b/ext/pcre/tests/preg_replace_error1.phpt
@@ -11,9 +11,9 @@ error_reporting(E_ALL&~E_NOTICE);
 * Testing how preg_replace reacts to being passed the wrong type of regex argument
 */
 echo "*** Testing preg_replace() : error conditions***\n";
-$regex_array = array('abcdef', //Regex without delimeter
-'/[a-zA-Z]', //Regex without closing delimeter
-'[a-zA-Z]/', //Regex without opening delimeter
+$regex_array = array('abcdef', //Regex without delimiter
+'/[a-zA-Z]', //Regex without closing delimiter
+'[a-zA-Z]/', //Regex without opening delimiter
 '/[a-zA-Z]/F', array('[a-z]', //Array of Regexes
 '[A-Z]', '[0-9]'), '/[a-zA-Z]/', //Regex string
 );
diff --git a/ext/pcre/tests/preg_split_basic.phpt b/ext/pcre/tests/preg_split_basic.phpt
index e94a94f62..5d23ce6df 100644
--- a/ext/pcre/tests/preg_split_basic.phpt
+++ b/ext/pcre/tests/preg_split_basic.phpt
@@ -7,7 +7,7 @@ Test preg_split() function : basic functionality
 * Function is implemented in ext/pcre/php_pcre.c
 */
 $string = 'this is a_list: value1, Test__, string; Hello, world!_(parentheses)';
-var_dump(preg_split('/[:,;\(\)]/', $string, -1, PREG_SPLIT_NO_EMPTY)); //parts of $string seperated by : , ; ( or ) are put into an array.
+var_dump(preg_split('/[:,;\(\)]/', $string, -1, PREG_SPLIT_NO_EMPTY)); //parts of $string separated by : , ; ( or ) are put into an array.
 var_dump(preg_split('/:\s*(\w*,*\s*)+;/', $string)); //all text between : and ; is removed
 var_dump(preg_split('/(\(|\))/', $string, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY)); //all text before (parentheses) is put into first element, ( into second, "parentheses" into third and ) into fourth.
 var_dump(preg_split('/NAME/i', $string)); //tries to find NAME regardless of case in $string (can't split it so just returns how string as first element)
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index e6265f580..d5860b1a1 100644
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -338,6 +338,9 @@ static PHP_METHOD(PDO, dbh_constructor)
 			if (pdbh->std.properties) {
 				zend_hash_destroy(dbh->std.properties);	
 				efree(dbh->std.properties);
+				if (dbh->std.properties_table) {
+					efree(dbh->std.properties_table);
+				}
 			} else {
 				pdbh->std.ce = dbh->std.ce;
 				pdbh->def_stmt_ce = dbh->def_stmt_ce;
@@ -896,7 +899,7 @@ static PHP_METHOD(PDO, getAttribute)
 	PDO_DBH_CLEAR_ERR();
 	PDO_CONSTRUCT_CHECK;
 
-	/* handle generic PDO-level atributes */
+	/* handle generic PDO-level attributes */
 	switch (attr) {
 		case PDO_ATTR_PERSISTENT:
 			RETURN_BOOL(dbh->is_persistent);
@@ -994,7 +997,7 @@ static PHP_METHOD(PDO, lastInsertId)
 		pdo_raise_impl_error(dbh, NULL, "IM001", "driver does not support lastInsertId()" TSRMLS_CC);
 		RETURN_FALSE;
 	} else {
-		Z_STRVAL_P(return_value) = dbh->methods->last_id(dbh, name, &Z_STRLEN_P(return_value) TSRMLS_CC);
+		Z_STRVAL_P(return_value) = dbh->methods->last_id(dbh, name, (unsigned int *)&Z_STRLEN_P(return_value) TSRMLS_CC);
 		if (!Z_STRVAL_P(return_value)) {
 			PDO_HANDLE_DBH_ERR();
 			RETURN_FALSE;
@@ -1575,6 +1578,7 @@ static void pdo_dbh_free_storage(pdo_dbh_t *dbh TSRMLS_DC)
 	}
 	zend_object_std_dtor(&dbh->std TSRMLS_CC);
 	dbh->std.properties = NULL;
+	dbh->std.properties_table = NULL;
 	dbh_free(dbh TSRMLS_CC);
 }
 
diff --git a/ext/pdo/pdo_sql_parser.c b/ext/pdo/pdo_sql_parser.c
index 6aee27545..fcaa4e492 100644
--- a/ext/pdo/pdo_sql_parser.c
+++ b/ext/pdo/pdo_sql_parser.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Thu Apr 19 12:42:11 2012 */
+/* Generated by re2c 0.13.5 on Tue Aug 20 18:02:48 2013 */
 /*
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
@@ -74,14 +74,14 @@ yy2:
 yy3:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych >= 0x01) goto yy41;
+	if (yych >= 0x01) goto yy43;
 yy4:
 	{ SKIP_ONE(PDO_PARSER_TEXT); }
 yy5:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 0x00) goto yy4;
-	goto yy36;
+	goto yy38;
 yy6:
 	yych = *++YYCURSOR;
 	switch (yych) {
@@ -148,14 +148,12 @@ yy6:
 	case 'x':
 	case 'y':
 	case 'z':	goto yy32;
-	case ':':
-	case '?':	goto yy29;
+	case ':':	goto yy35;
 	default:	goto yy4;
 	}
 yy7:
 	++YYCURSOR;
 	switch ((yych = *YYCURSOR)) {
-	case ':':
 	case '?':	goto yy29;
 	default:	goto yy8;
 	}
@@ -277,7 +275,6 @@ yy29:
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch (yych) {
-	case ':':
 	case '?':	goto yy29;
 	default:	goto yy31;
 	}
@@ -359,40 +356,48 @@ yy35:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy36:
 	switch (yych) {
-	case 0x00:	goto yy2;
-	case '\'':	goto yy38;
-	case '\\':	goto yy37;
-	default:	goto yy35;
+	case ':':	goto yy35;
+	default:	goto yy31;
 	}
 yy37:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= 0x00) goto yy2;
-	goto yy35;
 yy38:
+	switch (yych) {
+	case 0x00:	goto yy2;
+	case '\'':	goto yy40;
+	case '\\':	goto yy39;
+	default:	goto yy37;
+	}
+yy39:
 	++YYCURSOR;
-	{ RET(PDO_PARSER_TEXT); }
+	if (YYLIMIT <= YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	if (yych <= 0x00) goto yy2;
+	goto yy37;
 yy40:
 	++YYCURSOR;
+	{ RET(PDO_PARSER_TEXT); }
+yy42:
+	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy41:
+yy43:
 	switch (yych) {
 	case 0x00:	goto yy2;
-	case '"':	goto yy43;
-	case '\\':	goto yy42;
-	default:	goto yy40;
+	case '"':	goto yy45;
+	case '\\':	goto yy44;
+	default:	goto yy42;
 	}
-yy42:
+yy44:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if (yych <= 0x00) goto yy2;
-	goto yy40;
-yy43:
+	goto yy42;
+yy45:
 	++YYCURSOR;
 	{ RET(PDO_PARSER_TEXT); }
 }
@@ -741,9 +746,9 @@ int old_pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len, char
 		while (SUCCESS == zend_hash_get_current_data(params, (void**)&param)) {
 			if(param->parameter) {
 				convert_to_string(param->parameter);
-				/* accomodate a string that needs to be fully quoted
+				/* accommodate a string that needs to be fully quoted
                    bind placeholders are at least 2 characters, so
-                   the accomodate their own "'s
+                   the accommodate their own "'s
                 */
 				newbuffer_len += padding * Z_STRLEN_P(param->parameter);
 			}
diff --git a/ext/pdo/pdo_sql_parser.re b/ext/pdo/pdo_sql_parser.re
index d4272d679..1936a3734 100644
--- a/ext/pdo/pdo_sql_parser.re
+++ b/ext/pdo/pdo_sql_parser.re
@@ -50,14 +50,14 @@ static int scan(Scanner *s)
 	QUESTION	= [?];
 	COMMENTS	= ("/*"([^*]+|[*]+[^/*])*[*]*"*/"|"--"[^\r\n]*);
 	SPECIALS	= [:?"'];
-	MULTICHAR	= [:?];
+	MULTICHAR	= ([:]{2,}|[?]{2,});
 	ANYNOEOF	= [\001-\377];
 	*/
 
 	/*!re2c
 		(["](([\\]ANYNOEOF)|ANYNOEOF\["\\])*["]) { RET(PDO_PARSER_TEXT); }
 		(['](([\\]ANYNOEOF)|ANYNOEOF\['\\])*[']) { RET(PDO_PARSER_TEXT); }
-		MULTICHAR{2,}							{ RET(PDO_PARSER_TEXT); }
+		MULTICHAR								{ RET(PDO_PARSER_TEXT); }
 		BINDCHR									{ RET(PDO_PARSER_BIND); }
 		QUESTION								{ RET(PDO_PARSER_BIND_POS); }
 		SPECIALS								{ SKIP_ONE(PDO_PARSER_TEXT); }
@@ -408,9 +408,9 @@ int old_pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len, char
 		while (SUCCESS == zend_hash_get_current_data(params, (void**)&param)) {
 			if(param->parameter) {
 				convert_to_string(param->parameter);
-				/* accomodate a string that needs to be fully quoted
+				/* accommodate a string that needs to be fully quoted
                    bind placeholders are at least 2 characters, so
-                   the accomodate their own "'s
+                   the accommodate their own "'s
                 */
 				newbuffer_len += padding * Z_STRLEN_P(param->parameter);
 			}
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index a469d09fc..9622cb3cc 100644
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -1146,7 +1146,7 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value,
 							zval_ptr_dtor(&val);
 							pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "cannot unserialize class" TSRMLS_CC);
 							return 0;
-						} else if (ce->unserialize(&return_value, ce, Z_TYPE_P(val) == IS_STRING ? Z_STRVAL_P(val) : "", Z_TYPE_P(val) == IS_STRING ? Z_STRLEN_P(val) : 0, NULL TSRMLS_CC) == FAILURE) {
+						} else if (ce->unserialize(&return_value, ce, (unsigned char *)(Z_TYPE_P(val) == IS_STRING ? Z_STRVAL_P(val) : ""), Z_TYPE_P(val) == IS_STRING ? Z_STRLEN_P(val) : 0, NULL TSRMLS_CC) == FAILURE) {
 							zval_ptr_dtor(&val);
 							pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "cannot unserialize class" TSRMLS_CC);
 							zval_dtor(return_value);
@@ -1876,7 +1876,7 @@ static PHP_METHOD(PDOStatement, getColumnMeta)
 int pdo_stmt_setup_fetch_mode(INTERNAL_FUNCTION_PARAMETERS, pdo_stmt_t *stmt, int skip)
 {
 	long mode = PDO_FETCH_BOTH;
-	int flags, argc = ZEND_NUM_ARGS() - skip;
+	int flags = 0, argc = ZEND_NUM_ARGS() - skip;
 	zval ***args;
 	zend_class_entry **cep;
 	int retval;
diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h
index f38e7b5ec..ede2d6fb7 100644
--- a/ext/pdo/php_pdo_driver.h
+++ b/ext/pdo/php_pdo_driver.h
@@ -72,11 +72,11 @@ enum pdo_param_type {
 	/* get_col ptr should point to a zval*
 	   and the driver is responsible for adding correct type information to get_column_meta()
 	 */
-	PDO_PARAM_ZVAL
-};
+	PDO_PARAM_ZVAL,
 
-/* magic flag to denote a parameter as being input/output */
-#define	PDO_PARAM_INPUT_OUTPUT 	0x80000000	
+	/* magic flag to denote a parameter as being input/output */
+	PDO_PARAM_INPUT_OUTPUT = 0x80000000
+};
 
 #define PDO_PARAM_FLAGS			0xFFFF0000
 
@@ -469,7 +469,7 @@ struct _pdo_dbh_t {
 	/* when set, convert int/floats to strings */
 	unsigned stringify:1;
 
-	/* the sum of the number of bits here and the bit fields preceeding should
+	/* the sum of the number of bits here and the bit fields preceding should
 	 * equal 32 */
 	unsigned _reserved_flags:21;
 
diff --git a/ext/pdo/tests/bug61292.phpt b/ext/pdo/tests/bug61292.phpt
index 2381fd1a2..05b2e9c01 100644
--- a/ext/pdo/tests/bug61292.phpt
+++ b/ext/pdo/tests/bug61292.phpt
@@ -17,8 +17,15 @@ class Database_SQL extends PDO
 {
 	function __construct()
 	{
+                $dsn = getenv('PDOTEST_DSN');
+                $user = getenv('PDOTEST_USER');
+                $pass = getenv('PDOTEST_PASS');
+
+                if ($user === false) $user = NULL;
+                if ($pass === false) $pass = NULL;
 		$options = array(PDO::ATTR_PERSISTENT => TRUE);
-		parent::__construct(getenv("PDOTEST_DSN"), getenv("PDOTEST_USER"), getenv("PDOTEST_PASS"), $options);
+
+		parent::__construct($dsn, $user, $pass, $options);
 	}
 
 	var $bar = array();
diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c
index ffc910177..2aaf3975d 100644
--- a/ext/pdo_dblib/dblib_driver.c
+++ b/ext/pdo_dblib/dblib_driver.c
@@ -32,6 +32,9 @@
 #include "php_pdo_dblib_int.h"
 #include "zend_exceptions.h"
 
+/* Cache of the server supported datatypes, initialized in handle_factory */
+zval* pdo_dblib_datatypes;
+
 static int dblib_fetch_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, zval *info TSRMLS_DC)
 {
 	pdo_dblib_db_handle *H = (pdo_dblib_db_handle *)dbh->driver_data;
@@ -262,17 +265,41 @@ static struct pdo_dbh_methods dblib_methods = {
 static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_DC)
 {
 	pdo_dblib_db_handle *H;
-	int i, ret = 0;
+	int i, nvars, nvers, ret = 0;
+	int *val;
+	
+	const pdo_dblib_keyval tdsver[] = {
+		 {"4.2",DBVERSION_42}
+		,{"4.6",DBVERSION_46}
+		,{"5.0",DBVERSION_70} /* FIXME: This does not work with Sybase, but environ will */
+		,{"6.0",DBVERSION_70}
+		,{"7.0",DBVERSION_70}
+#ifdef DBVERSION_71
+		,{"7.1",DBVERSION_71}
+#endif
+#ifdef DBVERSION_72
+		,{"7.2",DBVERSION_72}
+		,{"8.0",DBVERSION_72}
+#endif
+		,{"10.0",DBVERSION_100}
+		,{"auto",0} /* Only works with FreeTDS. Other drivers will bork */
+		
+	};
+	
+	nvers = sizeof(tdsver)/sizeof(tdsver[0]);
+	
 	struct pdo_data_src_parser vars[] = {
-		{ "charset",	NULL,	0 },
-		{ "appname",	"PHP " PDO_DBLIB_FLAVOUR,	0 },
-		{ "host",		"127.0.0.1", 0 },
-		{ "dbname",		NULL,	0 },
-		{ "secure",		NULL,	0 }, /* DBSETLSECURE */
-		/* TODO: DBSETLVERSION ? */
+		{ "charset",	NULL,	0 }
+		,{ "appname",	"PHP " PDO_DBLIB_FLAVOUR,	0 }
+		,{ "host",		"127.0.0.1", 0 }
+		,{ "dbname",	NULL,	0 }
+		,{ "secure",	NULL,	0 } /* DBSETLSECURE */
+		,{ "version",	NULL,	0 } /* DBSETLVERSION */
 	};
-
-	php_pdo_parse_data_source(dbh->data_source, dbh->data_source_len, vars, 5);
+	
+	nvars = sizeof(vars)/sizeof(vars[0]);
+	
+	php_pdo_parse_data_source(dbh->data_source, dbh->data_source_len, vars, nvars);
 
 	H = pecalloc(1, sizeof(*H), dbh->is_persistent);
 	H->login = dblogin();
@@ -282,11 +309,37 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 		goto cleanup;
 	}
 
+	DBERRHANDLE(H->login, (EHANDLEFUNC) error_handler);
+	DBMSGHANDLE(H->login, (MHANDLEFUNC) msg_handler);
+	
+	if(vars[5].optval) {
+		for(i=0;i<nvers;i++) {
+			if(strcmp(vars[5].optval,tdsver[i].key) == 0) {
+				if(FAIL==dbsetlversion(H->login, tdsver[i].value)) {
+					pdo_raise_impl_error(dbh, NULL, "HY000", "PDO_DBLIB: Failed to set version specified in connection string." TSRMLS_CC);		
+					goto cleanup;
+				}
+				break;
+			}
+		}
+		
+		if (i==nvers) {
+			printf("Invalid version '%s'\n", vars[5].optval);
+			pdo_raise_impl_error(dbh, NULL, "HY000", "PDO_DBLIB: Invalid version specified in connection string." TSRMLS_CC);		
+			goto cleanup; /* unknown version specified */
+		}
+	}
+
 	if (dbh->username) {
-		DBSETLUSER(H->login, dbh->username);
+		if(FAIL == DBSETLUSER(H->login, dbh->username)) {
+			goto cleanup;
+		}
 	}
+
 	if (dbh->password) {
-		DBSETLPWD(H->login, dbh->password);
+		if(FAIL == DBSETLPWD(H->login, dbh->password)) {
+			goto cleanup;
+		}
 	}
 	
 #if !PHP_DBLIB_IS_MSSQL
@@ -297,36 +350,52 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 
 	DBSETLAPP(H->login, vars[1].optval);
 
-#if PHP_DBLIB_IS_MSSQL
-	dbprocerrhandle(H->login, (EHANDLEFUNC) error_handler);
-	dbprocmsghandle(H->login, (MHANDLEFUNC) msg_handler);
+#ifdef DBSETLDBNAME
+	if (vars[3].optval) {
+		DBSETLDBNAME(H->login, vars[3].optval);
+	}
 #endif
 
 	H->link = dbopen(H->login, vars[2].optval);
 
-	if (H->link == NULL) {
+	if (!H->link) {
 		goto cleanup;
 	}
 
+#if PHP_DBLIB_IS_MSSQL
 	/* dblib do not return more than this length from text/image */
 	DBSETOPT(H->link, DBTEXTLIMIT, "2147483647");
+#endif
 
 	/* limit text/image from network */
 	DBSETOPT(H->link, DBTEXTSIZE, "2147483647");
 
 	/* allow double quoted indentifiers */
-	DBSETOPT(H->link, DBQUOTEDIDENT, NULL);
-
-	if (vars[3].optval && FAIL == dbuse(H->link, vars[3].optval)) {
-		goto cleanup;
-	}
+	DBSETOPT(H->link, DBQUOTEDIDENT, "1");
 
 	ret = 1;
 	dbh->max_escaped_char_length = 2;
 	dbh->alloc_own_columns = 1;
 
+#if 0
+	/* Cache the supported data types from the servers systypes table */
+	if(dbcmd(H->link, "select usertype, name from systypes order by usertype") != FAIL) {
+		if(dbsqlexec(H->link) != FAIL) {
+			dbresults(H->link);
+			while (dbnextrow(H->link) == SUCCESS) {
+				val = dbdata(H->link, 1);					
+				add_index_string(pdo_dblib_datatypes, *val, dbdata(H->link, 2), 1);
+			}
+		}
+		/* Throw out any remaining resultsets */
+		dbcancel(H-link);
+	}
+#endif
+	
+
+
 cleanup:
-	for (i = 0; i < sizeof(vars)/sizeof(vars[0]); i++) {
+	for (i = 0; i < nvars; i++) {
 		if (vars[i].freeme) {
 			efree(vars[i].optval);
 		}
diff --git a/ext/pdo_dblib/dblib_stmt.c b/ext/pdo_dblib/dblib_stmt.c
index 1a2fefd47..51cebc48b 100644
--- a/ext/pdo_dblib/dblib_stmt.c
+++ b/ext/pdo_dblib/dblib_stmt.c
@@ -36,35 +36,51 @@
 
 /* {{{ pdo_dblib_get_field_name
  * 
- * Updated for MSSQL 2008 SR2 extended types
+ * Return the data type name for a given TDS number
  * 
  */
 static char *pdo_dblib_get_field_name(int type)
 {
+	/* 
+	 * I don't return dbprtype(type) because it does not fully describe the type 
+	 * (example: varchar is reported as char by dbprtype)
+	 * 
+	 * FIX ME: Cache datatypes from server systypes table in pdo_dblib_handle_factory()
+	 * 		   to make this future proof.
+	 */
+	 
 	switch (type) {
+		case 31: return "nvarchar";
 		case 34: return "image";
 		case 35: return "text";
 		case 36: return "uniqueidentifier";
+		case 37: return "varbinary"; /* & timestamp - Sybase AS12 */
+		case 38: return "bigint"; /* & bigintn - Sybase AS12 */
+		case 39: return "varchar"; /* & sysname & nvarchar - Sybase AS12 */
 		case 40: return "date";
 		case 41: return "time";
 		case 42: return "datetime2";
 		case 43: return "datetimeoffset";
+		case 45: return "binary"; /* Sybase AS12 */
+		case 47: return "char"; /* & nchar & uniqueidentifierstr Sybase AS12 */
 		case 48: return "tinyint";
+		case 50: return "bit"; /* Sybase AS12 */
 		case 52: return "smallint";
+		case 55: return "decimal"; /* Sybase AS12 */
 		case 56: return "int";
 		case 58: return "smalldatetime";
 		case 59: return "real";
 		case 60: return "money";
 		case 61: return "datetime";
 		case 62: return "float";
+		case 63: return "numeric"; /* or uint, ubigint, usmallint Sybase AS12 */
 		case 98: return "sql_variant";
 		case 99: return "ntext";
 		case 104: return "bit";
-		case 106: return "decimal";
-		case 108: return "numeric";
+		case 106: return "decimal"; /* decimal n on sybase */
+		case 108: return "numeric"; /* numeric n on sybase */
 		case 122: return "smallmoney";
 		case 127: return "bigint";
-		case 240: return "geometry";
 		case 165: return "varbinary";
 		case 167: return "varchar";
 		case 173: return "binary";
@@ -72,23 +88,22 @@ static char *pdo_dblib_get_field_name(int type)
 		case 189: return "timestamp";
 		case 231: return "nvarchar";
 		case 239: return "nchar";
+		case 240: return "geometry";
 		case 241: return "xml";
-		default: 
-			return "unknown";
-			break;
+		default: return "unknown";
 	}
 }
 /* }}} */
 
-static int dblib_dblib_stmt_cursor_closer(pdo_stmt_t *stmt TSRMLS_DC)
+static int pdo_dblib_stmt_cursor_closer(pdo_stmt_t *stmt TSRMLS_DC)
 {
 	pdo_dblib_stmt *S = (pdo_dblib_stmt*)stmt->driver_data;
 	pdo_dblib_db_handle *H = S->H;
 
 	/* Cancel any pending results */
 	dbcancel(H->link);
-
-	efree(stmt->columns);
+	
+	efree(stmt->columns); 
 	stmt->columns = NULL;
 	
 	return 1;
@@ -98,7 +113,8 @@ static int pdo_dblib_stmt_dtor(pdo_stmt_t *stmt TSRMLS_DC)
 {
 	pdo_dblib_stmt *S = (pdo_dblib_stmt*)stmt->driver_data;
 
-	dblib_dblib_stmt_cursor_closer(stmt TSRMLS_CC);
+	efree(stmt->columns); 
+	stmt->columns = NULL;
 
 	efree(S);
 		
@@ -113,7 +129,12 @@ static int pdo_dblib_stmt_next_rowset(pdo_stmt_t *stmt TSRMLS_DC)
 	
 	ret = dbresults(H->link);
 	
-	if (ret == FAIL || ret == NO_MORE_RESULTS) {
+	if (FAIL == ret) {
+		pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "PDO_DBLIB: dbresults() returned FAIL" TSRMLS_CC);		
+		return 0;
+	}
+		
+	if(NO_MORE_RESULTS == ret) {
 		return 0;
 	}
 	
@@ -131,6 +152,8 @@ static int pdo_dblib_stmt_execute(pdo_stmt_t *stmt TSRMLS_DC)
 	
 	dbsetuserdata(H->link, (BYTE*) &S->err);
 	
+	pdo_dblib_stmt_cursor_closer(stmt TSRMLS_CC);
+	
 	if (FAIL == dbcmd(H->link, stmt->active_query_string)) {
 		return 0;
 	}
@@ -141,10 +164,6 @@ static int pdo_dblib_stmt_execute(pdo_stmt_t *stmt TSRMLS_DC)
 	
 	ret = pdo_dblib_stmt_next_rowset(stmt TSRMLS_CC);
 	
-	if (ret == 0) {
-		return 0;
-	}
-	
 	stmt->row_count = DBCOUNT(H->link);
 	stmt->column_count = dbnumcols(H->link);
 	
@@ -162,7 +181,12 @@ static int pdo_dblib_stmt_fetch(pdo_stmt_t *stmt,
 	
 	ret = dbnextrow(H->link);
 	
-	if (ret == FAIL || ret == NO_MORE_ROWS) {
+	if (FAIL == ret) {
+		pdo_raise_impl_error(stmt->dbh, stmt, "HY000", "PDO_DBLIB: dbnextrow() returned FAIL" TSRMLS_CC);
+		return 0;
+	}
+		
+	if(NO_MORE_ROWS == ret) {
 		return 0;
 	}
 	
@@ -174,6 +198,10 @@ static int pdo_dblib_stmt_describe(pdo_stmt_t *stmt, int colno TSRMLS_DC)
 	pdo_dblib_stmt *S = (pdo_dblib_stmt*)stmt->driver_data;
 	pdo_dblib_db_handle *H = S->H;
 	
+	if(colno >= stmt->column_count || colno < 0)  {
+		return FAILURE;
+	}
+	
 	struct pdo_column_data *col = &stmt->columns[colno];
 	
 	col->name = (char*)dbcolname(H->link, colno+1);
@@ -205,11 +233,12 @@ static int pdo_dblib_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr,
 	}
 	
 	switch (coltype) {
-		case SQLCHAR:
-		case SQLTEXT:
 		case SQLVARBINARY:
 		case SQLBINARY:
 		case SQLIMAGE:
+		case SQLTEXT:
+			/* FIXME: Above types should be returned as a stream as they can be VERY large */
+		case SQLCHAR:
 		case SQLVARCHAR:
 			tmp_ptr = emalloc(*len + 1);
 			memcpy(tmp_ptr, *ptr, *len);
@@ -225,34 +254,26 @@ static int pdo_dblib_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr,
 			*ptr = tmp_ptr;
 			break;
 		}
-#ifdef SQLUNIQUE
 		case SQLUNIQUE: {
-#else
-		case 36: { /* FreeTDS hack, also used by ext/mssql */
-#endif
 			*len = 36+1;
 			tmp_ptr = emalloc(*len + 1);
 
 			/* uniqueidentifier is a 16-byte binary number, convert to 32 char hex string */
-#ifdef SQLUNIQUE
 			*len = dbconvert(NULL, SQLUNIQUE, *ptr, *len, SQLCHAR, tmp_ptr, *len);
-#else
-			*len = dbconvert(NULL, 36, *ptr, *len, SQLCHAR, tmp_ptr, *len);
-#endif
 			php_strtoupper(tmp_ptr, *len);
 			*ptr = tmp_ptr;
 			break;
 		}
 		default:
 			if (dbwillconvert(coltype, SQLCHAR)) {
-				tmp_len = 32 + (2 * (*len));
+				tmp_len = 32 + (2 * (*len)); /* FIXME: We allocate more than we need here */
 				tmp_ptr = emalloc(tmp_len);
 				*len = dbconvert(NULL, coltype, *ptr, *len, SQLCHAR, tmp_ptr, -1);
 				*ptr = tmp_ptr;
-		} else {
-			*len = 0;
-			*ptr = NULL;
-		}
+			} else {
+				*len = 0; /* FIXME: Silently fails and returns null on conversion errors */
+				*ptr = NULL;
+			}
 	}
 
 	*caller_frees = 1;
@@ -270,17 +291,25 @@ static int pdo_dblib_stmt_get_column_meta(pdo_stmt_t *stmt, long colno, zval *re
 {
 	pdo_dblib_stmt *S = (pdo_dblib_stmt*)stmt->driver_data;
 	pdo_dblib_db_handle *H = S->H;
-	
+	DBTYPEINFO* dbtypeinfo;
+
+	if(colno >= stmt->column_count || colno < 0)  {
+		return FAILURE;
+	}
+
 	array_init(return_value);
 
-	DBTYPEINFO* dbtypeinfo;
 	dbtypeinfo = dbcoltypeinfo(H->link, colno+1);
+	
+	if(!dbtypeinfo) return FAILURE;
 		
 	add_assoc_long(return_value, "max_length", dbcollen(H->link, colno+1) );
 	add_assoc_long(return_value, "precision", (int) dbtypeinfo->precision );
 	add_assoc_long(return_value, "scale", (int) dbtypeinfo->scale );
 	add_assoc_string(return_value, "column_source", dbcolsource(H->link, colno+1), 1);
 	add_assoc_string(return_value, "native_type", pdo_dblib_get_field_name(dbcoltype(H->link, colno+1)), 1);
+	add_assoc_long(return_value, "native_type_id", dbcoltype(H->link, colno+1));
+	add_assoc_long(return_value, "native_usertype_id", dbcolutype(H->link, colno+1));
 
 	return 1;
 }
@@ -297,6 +326,6 @@ struct pdo_stmt_methods dblib_stmt_methods = {
 	NULL, /* get attr */
 	pdo_dblib_stmt_get_column_meta, /* meta */
 	pdo_dblib_stmt_next_rowset, /* nextrow */
-	dblib_dblib_stmt_cursor_closer
+	pdo_dblib_stmt_cursor_closer
 };
 
diff --git a/ext/pdo_dblib/pdo_dblib.c b/ext/pdo_dblib/pdo_dblib.c
index ed79aea20..bc5d364ed 100644
--- a/ext/pdo_dblib/pdo_dblib.c
+++ b/ext/pdo_dblib/pdo_dblib.c
@@ -93,8 +93,12 @@ int error_handler(DBPROCESS *dbproc, int severity, int dberr,
 	char *state = "HY000";
 	TSRMLS_FETCH();
 
-	einfo = (pdo_dblib_err*)dbgetuserdata(dbproc);
-	if (!einfo) einfo = &DBLIB_G(err);
+	if(dbproc) {
+		einfo = (pdo_dblib_err*)dbgetuserdata(dbproc);
+		if (!einfo) einfo = &DBLIB_G(err);
+	} else {
+		einfo = &DBLIB_G(err);
+	}	
 
 	einfo->severity = severity;
 	einfo->oserr = oserr;
diff --git a/ext/pdo_dblib/php_pdo_dblib_int.h b/ext/pdo_dblib/php_pdo_dblib_int.h
index dd06a1d94..2bdb83c32 100644
--- a/ext/pdo_dblib/php_pdo_dblib_int.h
+++ b/ext/pdo_dblib/php_pdo_dblib_int.h
@@ -71,6 +71,8 @@
 # define SQLVARBINARY	SYBVARBINARY
 # ifdef SYBUNIQUE
 #  define SQLUNIQUE		SYBUNIQUE
+#else 
+#  define SQLUNIQUE		36 /* FreeTDS Hack */
 # endif
 
 # define DBERRHANDLE(a, b)	dberrhandle(b)
@@ -118,6 +120,12 @@ typedef struct {
 	pdo_dblib_err err;
 } pdo_dblib_stmt;
 
+typedef struct {
+	const char* key;
+	int value;
+} pdo_dblib_keyval;
+
+
 ZEND_BEGIN_MODULE_GLOBALS(dblib)
 	pdo_dblib_err err;
 	char sqlstate[6];
diff --git a/ext/pdo_firebird/firebird_statement.c b/ext/pdo_firebird/firebird_statement.c
index 5c3e435f7..2b57cd8ba 100644
--- a/ext/pdo_firebird/firebird_statement.c
+++ b/ext/pdo_firebird/firebird_statement.c
@@ -344,7 +344,7 @@ static int firebird_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr,  /* {{
 			if (n >= 0) {
 				*len = slprintf(*ptr, CHAR_BUF_LEN, "%" LL_MASK "d.%0*" LL_MASK "d", 
 					n / f, -var->sqlscale, n % f);
-			} else if (n < -f) {
+			} else if (n <= -f) {
 				*len = slprintf(*ptr, CHAR_BUF_LEN, "%" LL_MASK "d.%0*" LL_MASK "d",
 					n / f, -var->sqlscale, -n % f);				
 			 } else {
@@ -535,12 +535,14 @@ static int firebird_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_dat
 				int force_null;
 				
 				case IS_LONG:
-					var->sqltype = sizeof(long) == 8 ? SQL_INT64 : SQL_LONG;
+					/* keep the allow-NULL flag */
+					var->sqltype = (sizeof(long) == 8 ? SQL_INT64 : SQL_LONG) | (var->sqltype & 1);
 					var->sqldata = (void*)&Z_LVAL_P(param->parameter);
 					var->sqllen = sizeof(long);
 					break;
 				case IS_DOUBLE:
-					var->sqltype = SQL_DOUBLE;
+					/* keep the allow-NULL flag */
+					var->sqltype = SQL_DOUBLE | (var->sqltype & 1);
 					var->sqldata = (void*)&Z_DVAL_P(param->parameter);
 					var->sqllen = sizeof(double);
 					break;
@@ -560,7 +562,8 @@ static int firebird_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_dat
 							force_null = (Z_STRLEN_P(param->parameter) == 0);
 					}
 					if (!force_null) {
-						var->sqltype = SQL_TEXT;
+						/* keep the allow-NULL flag */
+						var->sqltype = SQL_TEXT | (var->sqltype & 1);
 						var->sqldata = Z_STRVAL_P(param->parameter);
 						var->sqllen	 = Z_STRLEN_P(param->parameter);
 						break;
diff --git a/ext/pdo_firebird/tests/bug_62024.phpt b/ext/pdo_firebird/tests/bug_62024.phpt
new file mode 100644
index 000000000..e046879c2
--- /dev/null
+++ b/ext/pdo_firebird/tests/bug_62024.phpt
@@ -0,0 +1,51 @@
+--TEST--
+Bug #62024 Cannot insert second row with null using parametrized query (Firebird PDO)
+--SKIPIF--
+<?php extension_loaded("pdo_firebird") or die("skip"); ?>
+<?php function_exists("ibase_query") or die("skip"); ?>
+--FILE--
+<?php
+
+require("testdb.inc");
+
+$dbh = new PDO("firebird:dbname=$test_base",$user,$password) or die;
+$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);
+$value = '2';
+@$dbh->exec('DROP TABLE test_insert');
+$dbh->exec("CREATE TABLE test_insert (ID INTEGER NOT NULL, TEXT VARCHAR(10))");
+
+$dbh->commit();
+
+//start actual test
+
+$sql = "insert into test_insert (id, text) values (?, ?)";
+$sttmt = $dbh->prepare($sql);
+
+$args_ok = array(1, "test1");
+$args_err = array(2, null);
+
+$res = $sttmt->execute($args_ok);
+var_dump($res);
+
+$res = $sttmt->execute($args_err);
+var_dump($res);
+
+$dbh->commit();
+
+
+//teardown test data
+$sttmt = $dbh->prepare('DELETE FROM test_insert');
+$sttmt->execute();
+
+$dbh->commit();
+
+$dbh->exec('DROP TABLE test_insert');
+
+unset($sttmt);
+unset($dbh);
+
+?>
+--EXPECT--
+bool(true)
+bool(true)
+
diff --git a/ext/pdo_firebird/tests/bug_64037.phpt b/ext/pdo_firebird/tests/bug_64037.phpt
new file mode 100644
index 000000000..f7b53e57a
--- /dev/null
+++ b/ext/pdo_firebird/tests/bug_64037.phpt
@@ -0,0 +1,45 @@
+--TEST--
+Bug #64037 Firebird return wrong value for numeric field
+--SKIPIF--
+<?php extension_loaded("pdo_firebird") or die("skip"); ?>
+<?php function_exists("ibase_query") or die("skip"); ?>
+--FILE--
+<?php
+
+require("testdb.inc");
+
+$dbh = new PDO("firebird:dbname=$test_base",$user,$password) or die;
+$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);
+$value = '2';
+@$dbh->exec('DROP TABLE price');
+$dbh->exec("CREATE TABLE PRICE (ID INTEGER NOT NULL, TEXT VARCHAR(10), COST NUMERIC(15, 2))");
+$dbh->exec("INSERT INTO PRICE (ID, TEXT, COST) VALUES (1, 'test', -1.0)");
+$dbh->exec("INSERT INTO PRICE (ID, TEXT, COST) VALUES (2, 'test', -0.99)");
+$dbh->exec("INSERT INTO PRICE (ID, TEXT, COST) VALUES (3, 'test', -1.01)");
+
+$dbh->commit();
+
+$query = "SELECT * from price order by ID";
+$stmt = $dbh->prepare($query);
+$stmt->execute();
+$rows = $stmt->fetchAll();
+var_dump($rows[0]['COST']);
+var_dump($rows[1]['COST']);
+var_dump($rows[2]['COST']);
+
+
+$stmt = $dbh->prepare('DELETE FROM price');
+$stmt->execute();
+
+$dbh->commit();
+
+$dbh->exec('DROP TABLE price');
+
+unset($stmt);
+unset($dbh);
+
+?>
+--EXPECT--
+string(5) "-1.00"
+string(5) "-0.99"
+string(5) "-1.01"
\ No newline at end of file
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index a703f93e7..32d13bafa 100644
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
@@ -527,9 +527,9 @@ static struct pdo_dbh_methods mysql_methods = {
 /* }}} */
 
 #ifdef PHP_WIN32
-# define MYSQL_UNIX_ADDR	NULL
+# define PDO_DEFAULT_MYSQL_UNIX_ADDR	NULL
 #else
-# define MYSQL_UNIX_ADDR	PDO_MYSQL_G(default_socket)
+# define PDO_DEFAULT_MYSQL_UNIX_ADDR	PDO_MYSQL_G(default_socket)
 #endif
 
 /* {{{ pdo_mysql_handle_factory */
@@ -545,7 +545,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 		{ "dbname",   "",	0 },
 		{ "host",   "localhost",	0 },
 		{ "port",   "3306",	0 },
-		{ "unix_socket",  MYSQL_UNIX_ADDR,	0 },
+		{ "unix_socket",  PDO_DEFAULT_MYSQL_UNIX_ADDR,	0 },
 	};
 	int connect_opts = 0
 #ifdef CLIENT_MULTI_RESULTS
diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c
index 2ae559571..369c38946 100644
--- a/ext/pdo_mysql/mysql_statement.c
+++ b/ext/pdo_mysql/mysql_statement.c
@@ -761,9 +761,12 @@ static char *type_to_name_native(int type) /* {{{ */
     switch (type) {
         PDO_MYSQL_NATIVE_TYPE_NAME(STRING)
         PDO_MYSQL_NATIVE_TYPE_NAME(VAR_STRING)
-#ifdef MYSQL_HAS_TINY
+#ifdef FIELD_TYPE_TINY
         PDO_MYSQL_NATIVE_TYPE_NAME(TINY)
 #endif
+#ifdef FIELD_TYPE_BIT
+        PDO_MYSQL_NATIVE_TYPE_NAME(BIT)
+#endif
         PDO_MYSQL_NATIVE_TYPE_NAME(SHORT)
         PDO_MYSQL_NATIVE_TYPE_NAME(LONG)
         PDO_MYSQL_NATIVE_TYPE_NAME(LONGLONG)
@@ -778,7 +781,7 @@ static char *type_to_name_native(int type) /* {{{ */
         PDO_MYSQL_NATIVE_TYPE_NAME(GEOMETRY)
 #endif
         PDO_MYSQL_NATIVE_TYPE_NAME(TIMESTAMP)
-#ifdef MYSQL_HAS_YEAR
+#ifdef FIELD_TYPE_YEAR
         PDO_MYSQL_NATIVE_TYPE_NAME(YEAR)
 #endif
         PDO_MYSQL_NATIVE_TYPE_NAME(SET)
diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c
index 1dbb30f27..0d4e525cd 100644
--- a/ext/pdo_mysql/pdo_mysql.c
+++ b/ext/pdo_mysql/pdo_mysql.c
@@ -61,7 +61,7 @@ ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql)
 #include "ext/mysqlnd/mysqlnd_reverse_api.h"
 static MYSQLND * pdo_mysql_convert_zv_to_mysqlnd(zval * zv TSRMLS_DC)
 {
-	if (Z_TYPE_P(zv) == IS_OBJECT && Z_OBJCE_P(zv) == php_pdo_get_dbh_ce()) {
+	if (Z_TYPE_P(zv) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zv), php_pdo_get_dbh_ce() TSRMLS_CC)) {
 		pdo_dbh_t * dbh = zend_object_store_get_object(zv TSRMLS_CC);
 
 		if (!dbh || dbh->driver != &pdo_mysql_driver) {
diff --git a/ext/pdo_mysql/tests/bug63176.phpt b/ext/pdo_mysql/tests/bug63176.phpt
new file mode 100644
index 000000000..ee928c093
--- /dev/null
+++ b/ext/pdo_mysql/tests/bug63176.phpt
@@ -0,0 +1,54 @@
+--TEST--
+Bug #63176 (Segmentation fault when instantiate 2 persistent PDO to the same db server)
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
+require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+MySQLPDOTest::skip();
+?>
+--FILE--
+<?php
+require(dirname(__FILE__). DIRECTORY_SEPARATOR . 'config.inc');
+class PDO2 extends PDO {
+	protected $transLevel;
+}
+
+class PDO3 extends PDO {
+	protected $tomato;
+}
+
+
+class ModelA {
+	public function __construct($h) {
+		var_dump($h);
+		if ($h) {
+			$this->db = new PDO2(PDO_MYSQL_TEST_DSN, PDO_MYSQL_TEST_USER, PDO_MYSQL_TEST_PASS, array(PDO::ATTR_PERSISTENT => true));
+		} else {
+			$this->db = new PDO3(PDO_MYSQL_TEST_DSN, PDO_MYSQL_TEST_USER, PDO_MYSQL_TEST_PASS, array(PDO::ATTR_PERSISTENT => true));
+		}
+		$this->db->query('SELECT 1')->fetchAll();
+	}
+}
+
+$a = new ModelA(true);
+$b = new ModelA(false);
+
+var_dump($a);
+var_dump($b);
+--EXPECTF--
+bool(true)
+bool(false)
+object(ModelA)#%d (1) {
+  ["db"]=>
+  object(PDO2)#%d (1) {
+    ["transLevel":protected]=>
+    NULL
+  }
+}
+object(ModelA)#%d (1) {
+  ["db"]=>
+  object(PDO2)#%d (1) {
+    ["transLevel":protected]=>
+    NULL
+  }
+}
diff --git a/ext/pdo_mysql/tests/mysql_pdo_test.inc b/ext/pdo_mysql/tests/mysql_pdo_test.inc
index 115aeadc5..7a97bb463 100644
--- a/ext/pdo_mysql/tests/mysql_pdo_test.inc
+++ b/ext/pdo_mysql/tests/mysql_pdo_test.inc
@@ -162,8 +162,8 @@ class MySQLPDOTest extends PDOTest {
 			phpinfo();
 			$tmp = ob_get_contents();
 			ob_end_clean();
-			$tmp = stristr($tmp, "PDO Driver for MySQL => enabled");
-			return (bool)preg_match('/Client API version.*mysqlnd/', $tmp);
+			return (preg_match('/PDO Driver for MySQL.*enabled/', $tmp) &&
+				preg_match('/Client API version.*mysqlnd/', $tmp));
 	}
 
 	static function dropTestTable($db = NULL) {
@@ -174,4 +174,4 @@ class MySQLPDOTest extends PDOTest {
 	}
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt b/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
index b550cb8da..ebf22ef61 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
@@ -48,6 +48,7 @@ if (($tmp[1] !== 'localhost') && ($tmp[1] !== '127.0.0.1'))
 	}
 
 	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+	putenv('PDOTEST_ATTR='.serialize([PDO::MYSQL_ATTR_LOCAL_INFILE=>true]));
 	$db = MySQLPDOTest::factory();
 	MySQLPDOTest::createTestTable($db, MySQLPDOTest::detect_transactional_mysql_engine($db));
 
diff --git a/ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt b/ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt
index a570c1fd4..74b4a7358 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt
@@ -18,10 +18,9 @@ $db = MySQLPDOTest::factory();
 	ob_end_clean();
 
 	/*	PDO Driver for MySQL, client library version => 6.0.3-alpha	*/
-	$expected = sprintf('Client API version => %s',
-		$db->getAttribute(PDO::ATTR_CLIENT_VERSION));
+	$reg = 'Client API version.*' . preg_quote($db->getAttribute(PDO::ATTR_CLIENT_VERSION), '/');
 
-	if (false === stristr($tmp, $expected)) {
+	if (!preg_match("/$reg/", $tmp)) {
 		printf("[001] Cannot find MySQL PDO driver line in phpinfo() output\n");
 	}
 
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt
index 0fef33487..d2097f116 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt
@@ -148,9 +148,9 @@ try {
 
 	$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
 	$is_mysqlnd = MySQLPDOTest::isPDOMySQLnd();
-	test_meta($db, 20, 'BIT(8)', 1, NULL, ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR);
-	test_meta($db, 30, 'TINYINT', -127, NULL, ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR);
-	test_meta($db, 40, 'TINYINT UNSIGNED', 255, NULL, ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR);
+	test_meta($db, 20, 'BIT(8)', 1, 'BIT', ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR);
+	test_meta($db, 30, 'TINYINT', -127, 'TINY', ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR);
+	test_meta($db, 40, 'TINYINT UNSIGNED', 255, 'TINY', ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR);
 	test_meta($db, 50, 'BOOLEAN', 1, NULL, ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR);
 
 	test_meta($db, 60, 'SMALLINT', -32768, 'SHORT', ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR);
@@ -194,7 +194,7 @@ try {
 	test_meta($db, 340, 'TIME', '14:37:00', 'TIME', PDO::PARAM_STR);
 	test_meta($db, 350, 'TIMESTAMP', time(), 'TIMESTAMP', PDO::PARAM_STR);
 	test_meta($db, 360, 'DATETIME', '2008-03-23 14:38:00', 'DATETIME', PDO::PARAM_STR);
-	test_meta($db, 370, 'YEAR', '2008', NULL, ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR);
+	test_meta($db, 370, 'YEAR', '2008', 'YEAR', ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR);
 
 	test_meta($db, 380, 'CHAR(1)', 'a', 'STRING', PDO::PARAM_STR);
 	test_meta($db, 390, 'CHAR(10)', '0123456789', 'STRING', PDO::PARAM_STR);
@@ -311,4 +311,4 @@ print "done!";
 ?>
 --EXPECTF--
 Testing native PS...
-done!
\ No newline at end of file
+done!
diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4
index 309bde8a5..0e42d1f9a 100755
--- a/ext/pdo_oci/config.m4
+++ b/ext/pdo_oci/config.m4
@@ -2,7 +2,7 @@ dnl $Id$
 dnl config.m4 for extension pdo_oci
 dnl vim:et:sw=2:ts=2:
 
-SUPPORTED_LIB_VERS="9.0 10.1 11.1"  # This caters for all Oracle 9.x, 10.x and 11.1 installs
+SUPPORTED_LIB_VERS="9.0 10.1 11.1 12.1"  # The lib vers are not bumped when the DB version is bumped
 AC_DEFUN([AC_PDO_OCI_VERSION],[
   AC_MSG_CHECKING([Oracle version])
   for OCI_VER in $SUPPORTED_LIB_VERS; do
@@ -147,7 +147,7 @@ You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_
   fi
 
   case $PDO_OCI_VERSION in
-    9.0|10.1|10.2|11.1|11.2)
+    9.0|10.1|10.2|11.1|11.2|12.1)
       PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD)
       ;;
 
diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c
index 5497bebc6..fcdefa94b 100644
--- a/ext/pdo_oci/oci_driver.c
+++ b/ext/pdo_oci/oci_driver.c
@@ -537,7 +537,9 @@ static int pdo_oci_check_liveness(pdo_dbh_t *dbh TSRMLS_DC) /* {{{ */
 {
 	pdo_oci_db_handle *H = (pdo_oci_db_handle *)dbh->driver_data;
 	sb4 error_code = 0;
+#if (!((OCI_MAJOR_VERSION > 10) || ((OCI_MAJOR_VERSION == 10) && (OCI_MINOR_VERSION >= 2))))
 	char version[256];
+#endif
 
 	/* TODO move attached check to PDO level */
 	if (H->attached == 0) {
diff --git a/ext/pdo_oci/oci_statement.c b/ext/pdo_oci/oci_statement.c
index dcb955780..6a74efa7b 100644
--- a/ext/pdo_oci/oci_statement.c
+++ b/ext/pdo_oci/oci_statement.c
@@ -270,6 +270,12 @@ static int oci_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *pa
 		P = (pdo_oci_bound_param*)param->driver_data;
 
 		switch (event_type) {
+			case PDO_PARAM_EVT_FETCH_PRE:
+			case PDO_PARAM_EVT_FETCH_POST:
+			case PDO_PARAM_EVT_NORMALIZE:
+				/* Do nothing */
+				break;
+
 			case PDO_PARAM_EVT_FREE:
 				P = param->driver_data;
 				if (P) {
diff --git a/ext/pdo_oci/tests/pdo_oci_attr_autocommit_3.phpt b/ext/pdo_oci/tests/pdo_oci_attr_autocommit_3.phpt
index 81e9b74ff..ab9b99fc6 100644
--- a/ext/pdo_oci/tests/pdo_oci_attr_autocommit_3.phpt
+++ b/ext/pdo_oci/tests/pdo_oci_attr_autocommit_3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-PDO_OCI: Atrribute: closing a connection in non-autocommit mode commits data
+PDO_OCI: Attribute: closing a connection in non-autocommit mode commits data
 --SKIPIF--
 <?php
 if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not loaded');
diff --git a/ext/pdo_oci/tests/pdo_oci_attr_client.phpt b/ext/pdo_oci/tests/pdo_oci_attr_client.phpt
index 372ccec8e..eadb028e0 100644
--- a/ext/pdo_oci/tests/pdo_oci_attr_client.phpt
+++ b/ext/pdo_oci/tests/pdo_oci_attr_client.phpt
@@ -18,7 +18,7 @@ $cv = $dbh->getAttribute(PDO::ATTR_CLIENT_VERSION);
 var_dump($cv);
 
 $s = explode(".", $cv);
-if ($s[0] >= 10 && count($s) > 1 && $s[1] >= 2) {
+if (count($s) > 1 && (($s[0] == 10 && $s[1] >= 2) || $s[0] >= 11)) {
 	if (count($s) != 5) {
 		echo "Wrong number of values in array\nVersion was: ";
 		var_dump($cv);
diff --git a/ext/pdo_odbc/odbc_driver.c b/ext/pdo_odbc/odbc_driver.c
index 33163688e..f7f3ef34e 100644
--- a/ext/pdo_odbc/odbc_driver.c
+++ b/ext/pdo_odbc/odbc_driver.c
@@ -263,7 +263,7 @@ out:
 
 static int odbc_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, int unquotedlen, char **quoted, int *quotedlen, enum pdo_param_type param_type  TSRMLS_DC)
 {
-	pdo_odbc_db_handle *H = (pdo_odbc_db_handle *)dbh->driver_data;
+	/* pdo_odbc_db_handle *H = (pdo_odbc_db_handle *)dbh->driver_data; */
 	/* TODO: figure it out */
 	return 0;
 }
diff --git a/ext/pdo_odbc/odbc_stmt.c b/ext/pdo_odbc/odbc_stmt.c
index 6ee2fcd6b..0e3fd3cbb 100644
--- a/ext/pdo_odbc/odbc_stmt.c
+++ b/ext/pdo_odbc/odbc_stmt.c
@@ -286,6 +286,12 @@ static int odbc_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *p
 	if (param->is_param) {
 
 		switch (event_type) {
+			case PDO_PARAM_EVT_FETCH_PRE:
+			case PDO_PARAM_EVT_FETCH_POST:
+			case PDO_PARAM_EVT_NORMALIZE:
+				/* Do nothing */
+				break;
+
 			case PDO_PARAM_EVT_FREE:
 				P = param->driver_data;
 				if (P) {
@@ -543,7 +549,6 @@ static int odbc_stmt_describe(pdo_stmt_t *stmt, int colno TSRMLS_DC)
 {
 	pdo_odbc_stmt *S = (pdo_odbc_stmt*)stmt->driver_data;
 	struct pdo_column_data *col = &stmt->columns[colno];
-	zend_bool dyn = FALSE;
 	RETCODE rc;
 	SWORD	colnamelen;
 	SDWORD	colsize, displaysize;
@@ -614,7 +619,6 @@ static int odbc_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, unsigned l
 
 	/* if it is a column containing "long" data, perform late binding now */
 	if (C->is_long) {
-		unsigned long alloced = 4096;
 		unsigned long used = 0;
 		char *buf;
 		RETCODE rc;
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c
index a54fccd0e..50136430a 100644
--- a/ext/pdo_pgsql/pgsql_driver.c
+++ b/ext/pdo_pgsql/pgsql_driver.c
@@ -76,7 +76,7 @@ int _pdo_pgsql_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, int errcode, const char *
 		einfo->errmsg = NULL;
 	}
 
-	if (sqlstate == NULL) {
+	if (sqlstate == NULL || strlen(sqlstate) >= sizeof(pdo_error_type)) {
 		strcpy(*pdo_err, "HY000");
 	}
 	else {
@@ -315,9 +315,9 @@ static int pgsql_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, int unquote
 		case PDO_PARAM_LOB:
 			/* escapedlen returned by PQescapeBytea() accounts for trailing 0 */
 #ifdef HAVE_PQESCAPE_BYTEA_CONN
-			escaped = PQescapeByteaConn(H->server, unquoted, unquotedlen, &tmp_len);
+			escaped = PQescapeByteaConn(H->server, (unsigned char *)unquoted, (size_t)unquotedlen, &tmp_len);
 #else
-			escaped = PQescapeBytea(unquoted, unquotedlen, &tmp_len);
+			escaped = PQescapeBytea((unsigned char *)unquoted, (size_t)unquotedlen, &tmp_len);
 #endif
 			*quotedlen = (int)tmp_len + 1;
 			*quoted = emalloc(*quotedlen + 1);
@@ -331,9 +331,9 @@ static int pgsql_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, int unquote
 			*quoted = safe_emalloc(2, unquotedlen, 3);
 			(*quoted)[0] = '\'';
 #ifndef HAVE_PQESCAPE_CONN
-			*quotedlen = PQescapeString(*quoted + 1, unquoted, unquotedlen);
+			*quotedlen = PQescapeString(*quoted + 1, unquoted, (size_t)unquotedlen);
 #else
-			*quotedlen = PQescapeStringConn(H->server, *quoted + 1, unquoted, unquotedlen, NULL);
+			*quotedlen = PQescapeStringConn(H->server, *quoted + 1, unquoted, (size_t)unquotedlen, NULL);
 #endif
 			(*quoted)[*quotedlen + 1] = '\'';
 			(*quoted)[*quotedlen + 2] = '\0';
diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c
index d58eebf8f..792ad2707 100644
--- a/ext/pdo_pgsql/pgsql_statement.c
+++ b/ext/pdo_pgsql/pgsql_statement.c
@@ -536,7 +536,7 @@ static int pgsql_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, unsigned
 					*len = 0;
 					return 0;
 				} else {
-					char *tmp_ptr = PQunescapeBytea(*ptr, &tmp_len);
+					char *tmp_ptr = (char *)PQunescapeBytea((unsigned char *)*ptr, &tmp_len);
 					if (!tmp_ptr) {
 						/* PQunescapeBytea returned an error */
 						*len = 0;
@@ -587,7 +587,7 @@ static int pgsql_stmt_get_column_meta(pdo_stmt_t *stmt, long colno, zval *return
 	add_assoc_long(return_value, "pgsql:oid", S->cols[colno].pgsql_type);
 
 	/* Fetch metadata from Postgres system catalogue */
-	spprintf(&q, 0, "SELECT TYPNAME FROM PG_TYPE WHERE OID=%d", S->cols[colno].pgsql_type);
+	spprintf(&q, 0, "SELECT TYPNAME FROM PG_TYPE WHERE OID=%u", S->cols[colno].pgsql_type);
 	res = PQexec(S->H->server, q);
 	efree(q);
 	
diff --git a/ext/pdo_pgsql/tests/bug46274.phpt b/ext/pdo_pgsql/tests/bug46274.phpt
index c34839ad4..40706ecaa 100644
--- a/ext/pdo_pgsql/tests/bug46274.phpt
+++ b/ext/pdo_pgsql/tests/bug46274.phpt
@@ -14,6 +14,11 @@ $db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
 
 $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
 
+try {
+	@$db->query("SET bytea_output = 'escape'");
+} catch (Exception $e) {
+}
+
 $db->query('CREATE TABLE test_one_blob (id SERIAL NOT NULL, blob1 BYTEA)');
 
 $stmt = $db->prepare("INSERT INTO test_one_blob (blob1) VALUES (:foo)");
diff --git a/ext/pdo_pgsql/tests/bug46274_2.phpt b/ext/pdo_pgsql/tests/bug46274_2.phpt
index eb675afe9..df60f3454 100644
--- a/ext/pdo_pgsql/tests/bug46274_2.phpt
+++ b/ext/pdo_pgsql/tests/bug46274_2.phpt
@@ -14,6 +14,11 @@ $db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
 
 $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
 
+try {
+        @$db->query("SET bytea_output = 'escape'");
+} catch (Exception $e) {
+}
+
 $db->query('CREATE TABLE test_one_blob (id SERIAL NOT NULL, blob1 BYTEA)');
 
 $stmt = $db->prepare("INSERT INTO test_one_blob (blob1) VALUES (:foo)");
diff --git a/ext/pdo_pgsql/tests/bug64953.phpt b/ext/pdo_pgsql/tests/bug64953.phpt
new file mode 100644
index 000000000..6e72bcab6
--- /dev/null
+++ b/ext/pdo_pgsql/tests/bug64953.phpt
@@ -0,0 +1,71 @@
+--TEST--
+PDO PgSQL Bug #64953 (Postgres prepared statement positional parameter casting)
+--SKIPIF--
+<?php
+if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
+require dirname(__FILE__) . '/config.inc';
+require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+echo "Test\n";
+
+require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+$pdo = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
+$pdo->setAttribute (\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+
+echo "Taken from the bug report:\n";
+
+$st = $pdo->prepare('SELECT ?::char as i');
+$st->bindValue(1, '1');
+$st->execute();
+var_dump($st->fetch()); // return false
+
+
+$st = $pdo->prepare('SELECT (?)::char as i');
+$st->bindValue(1, '1');
+$st->execute();
+var_dump($st->fetch());  // return array(1) { ["i"]=> string(1) "1" }
+
+echo "Something more nasty:\n";
+
+$st = $pdo->prepare("SELECT :int::int as i");
+$st->execute(array(":int" => 123));
+var_dump($st->fetch());
+
+$st = $pdo->prepare("SELECT '''?'''::text as \":text\"");
+$st->execute();
+var_dump($st->fetch());
+
+?>
+Done
+--EXPECT--
+Test
+Taken from the bug report:
+array(2) {
+  ["i"]=>
+  string(1) "1"
+  [0]=>
+  string(1) "1"
+}
+array(2) {
+  ["i"]=>
+  string(1) "1"
+  [0]=>
+  string(1) "1"
+}
+Something more nasty:
+array(2) {
+  ["i"]=>
+  string(3) "123"
+  [0]=>
+  string(3) "123"
+}
+array(2) {
+  [":text"]=>
+  string(3) "'?'"
+  [0]=>
+  string(3) "'?'"
+}
+Done
diff --git a/ext/pdo_pgsql/tests/bug_33876.phpt b/ext/pdo_pgsql/tests/bug_33876.phpt
index 48618e13d..6a93905b4 100644
--- a/ext/pdo_pgsql/tests/bug_33876.phpt
+++ b/ext/pdo_pgsql/tests/bug_33876.phpt
@@ -82,7 +82,7 @@ else
 # false -> "" as string, which pgsql doesn't like
 if (!$res->execute(array(false))) {
 	$err = $res->errorInfo();
-	// Strip additional lines ouputted by recent PgSQL versions
+	// Strip additional lines outputted by recent PgSQL versions
 	$err[2] = trim(current(explode("\n", $err[2])));
 	print_r($err);
 } else {
diff --git a/ext/pdo_pgsql/tests/bug_49985.phpt b/ext/pdo_pgsql/tests/bug_49985.phpt
index 26dcfc617..e1d7df82a 100644
--- a/ext/pdo_pgsql/tests/bug_49985.phpt
+++ b/ext/pdo_pgsql/tests/bug_49985.phpt
@@ -30,6 +30,6 @@ for ($i = 0; $i < 3; $i++) {
 ?>
 --EXPECTF--
 bool(true)
-SQLSTATE[23505]: %s"test_pkey"
-SQLSTATE[23505]: %s"test_pkey"
+SQLSTATE[23505]: %stest_pkey%s
+SQLSTATE[23505]: %stest_pkey%s
 
diff --git a/ext/pdo_pgsql/tests/copy_from.phpt b/ext/pdo_pgsql/tests/copy_from.phpt
index 2858905d0..10967b0fe 100644
--- a/ext/pdo_pgsql/tests/copy_from.phpt
+++ b/ext/pdo_pgsql/tests/copy_from.phpt
@@ -110,8 +110,10 @@ $db->rollback();
 	echo "Exception! at line ", $e->getLine(), "\n";
 	var_dump($e->getMessage());
 }
-if(isset($filename)) {
-	@unlink($filename);
+
+// Clean up 
+foreach (array($filename, $filenameWithDifferentNullValues, $filenameWithDifferentNullValuesAndSelectedFields) as $f) {
+	@unlink($f);
 }
 ?>
 --EXPECT--
@@ -383,4 +385,4 @@ array(6) {
   NULL
 }
 Testing pgsqlCopyFromFile() with error
-bool(false)
\ No newline at end of file
+bool(false)
diff --git a/ext/pdo_pgsql/tests/is_in_transaction.phpt b/ext/pdo_pgsql/tests/is_in_transaction.phpt
index 99ff56162..72da4f4e0 100644
--- a/ext/pdo_pgsql/tests/is_in_transaction.phpt
+++ b/ext/pdo_pgsql/tests/is_in_transaction.phpt
@@ -57,10 +57,10 @@ var_dump($db->inTransaction());
 ?>
 --EXPECT--
 Test PDO::PGSQL_TRANSACTION_INTRANS
-int(2)
+bool(true)
 Test PDO::PGSQL_TRANSACTION_IDLE
-int(0)
+bool(false)
 Test PDO::PGSQL_TRANSACTION_INERROR
-int(3)
+bool(true)
 Test PDO::PGSQL_TRANSACTION_IDLE
-int(0)
+bool(false)
diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_createfunction_002.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_createfunction_002.phpt
new file mode 100644
index 000000000..a1d890ac1
--- /dev/null
+++ b/ext/pdo_sqlite/tests/pdo_sqlite_createfunction_002.phpt
@@ -0,0 +1,17 @@
+--TEST--
+PDO_sqlite: Testing sqliteCreateFunction() produces warning when
+un-callable function passed
+--CREDITS--
+Chris MacPherson chris@kombine.co.uk
+--SKIPIF--
+<?php if (!extension_loaded('pdo_sqlite')) print 'skip not loaded'; ?>
+--FILE--
+<?php
+
+$db = new PDO( 'sqlite::memory:');
+
+$db->sqliteCreateFunction('bar-alias', 'bar');
+
+?>
+--EXPECTF--
+Warning: PDO::sqliteCreateFunction(): function 'bar' is not callable in %s on line %d
diff --git a/ext/pgsql/README b/ext/pgsql/README
index 2b4c41233..785b4f034 100644
--- a/ext/pgsql/README
+++ b/ext/pgsql/README
@@ -35,7 +35,7 @@ names.
 Older names will become aliases of new functions for backward
 compatibility.
 
-Manual will be updated when this change is commited to CVS source.
+Manual will be updated when this change is committed to CVS source.
 
 ==== Configure Option Notes ====
 You cannot specify PostgreSQL source directly to build PostgreSQL
diff --git a/ext/pgsql/mysql_users.php b/ext/pgsql/mysql_users.php
index 65a2c3396..edfaa1cdd 100644
--- a/ext/pgsql/mysql_users.php
+++ b/ext/pgsql/mysql_users.php
@@ -56,7 +56,7 @@ ORDER BY 1;
 /*
  * mysql_list_fields()
  *
- * See also pg_meta_data(). It returns field defintion as array.
+ * See also pg_meta_data(). It returns field definition as array.
  */
 function pg_list_fields($db, $table) 
 {
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index d01dda603..f4c4cb37e 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -63,6 +63,7 @@
 #define PGSQL_MAX_LENGTH_OF_LONG   30
 #define PGSQL_MAX_LENGTH_OF_DOUBLE 60
 
+#if LONG_MAX < UINT_MAX
 #define PGSQL_RETURN_OID(oid) do { \
 	if (oid > LONG_MAX) { \
 		smart_str s = {0}; \
@@ -72,7 +73,9 @@
 	} \
 	RETURN_LONG((long)oid); \
 } while(0)
-
+#else
+#define PGSQL_RETURN_OID(oid) (RETURN_LONG((long)oid))
+#endif
 
 #if HAVE_PQSETNONBLOCKING
 #define PQ_SETNONBLOCKING(pg_link, flag) PQsetnonblocking(pg_link, flag)
@@ -914,6 +917,82 @@ static void _free_result(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 }
 /* }}} */
 
+
+static int _php_pgsql_detect_identifier_escape(const char *identifier, size_t len)
+{
+	size_t i;
+
+	/* Handle edge case. Cannot be a escaped string */
+	if (len <= 2) {
+		return FAILURE;
+	}
+	/* Detect double qoutes */
+	if (identifier[0] == '"' && identifier[len-1] == '"') {
+		/* Detect wrong format of " inside of escaped string */
+		for (i = 1; i < len-1; i++) {
+			if (identifier[i] == '"' && (identifier[++i] != '"' || i == len-1)) {
+				return FAILURE;
+			}
+		}
+	} else {
+		return FAILURE;
+	}
+	/* Escaped properly */
+	return SUCCESS;
+}
+
+#if !HAVE_PQESCAPELITERAL
+/* {{{ _php_pgsql_escape_identifier
+ * Since PQescapeIdentifier() is unavailable (PostgreSQL 9.0 <), idenfifers
+ * should be escaped by pgsql module.
+ * Note: this function does not care for encoding. Therefore users should not
+ * use this with SJIS/BIG5 etc. (i.e. Encoding base injection may possible with
+ * before PostgreSQL 9.0)
+ */
+static char *_php_pgsql_escape_identifier(const char *field, size_t field_len)
+{
+	ulong field_escaped_len = field_len*2 + 3;
+	ulong i, j = 0;
+	char *field_escaped;
+
+	field_escaped = (char *)malloc(field_escaped_len);
+	field_escaped[j++] = '"';
+	for (i = 0; i < field_len; i++) {
+		if (field[i] == '"') {
+			field_escaped[j++] = '"';
+			field_escaped[j++] = '"';
+		} else {
+			field_escaped[j++] = field[i];
+		}
+	}
+	field_escaped[j++] = '"';
+	field_escaped[j] = '\0';
+	return field_escaped;
+}
+/* }}} */
+#endif
+
+/* {{{ _php_pgsql_strndup, no strndup should be used */
+static char *_php_pgsql_strndup(const char *s, size_t len)
+{
+	char *new;
+
+	if (NULL == s) {
+		return (char *)NULL;
+	}
+
+	new = (char *) malloc(len + 1);
+
+	if (NULL == new) {
+		return (char *)NULL;
+	}
+
+	new[len] = '\0';
+
+	return memmove(new, s, len);
+}
+/* }}} */
+
 /* {{{ PHP_INI
  */
 PHP_INI_BEGIN()
@@ -4076,7 +4155,7 @@ PHP_FUNCTION(pg_escape_bytea)
 #ifdef HAVE_PQESCAPE_BYTEA_CONN
 	if (pgsql_link != NULL || id != -1) {
 		ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink);
-		to = (char *)PQescapeByteaConn(pgsql, from, (size_t)from_len, &to_len);
+		to = (char *)PQescapeByteaConn(pgsql, (unsigned char *)from, (size_t)from_len, &to_len);
 	} else
 #endif
 		to = (char *)PQescapeBytea((unsigned char*)from, from_len, &to_len);
@@ -4270,10 +4349,9 @@ static char* php_pgsql_PQescapeInternal(PGconn *conn, const char *str, size_t le
 #endif
 
 static void php_pgsql_escape_internal(INTERNAL_FUNCTION_PARAMETERS, int escape_literal) {
-	char *from = NULL, *to = NULL, *tmp = NULL;
+	char *from = NULL, *to = NULL;
 	zval *pgsql_link = NULL;
 	PGconn *pgsql;
-	int to_len;
 	int from_len;
 	int id = -1;
 
@@ -4294,26 +4372,32 @@ static void php_pgsql_escape_internal(INTERNAL_FUNCTION_PARAMETERS, int escape_l
 	}
 
 	if (pgsql_link == NULL && id == -1) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING,"Cannot get default pgsql link");
 		RETURN_FALSE;
 	}
 
 	ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink);
 	if (pgsql == NULL) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,"Cannot get default pgsql link");
+		php_error_docref(NULL TSRMLS_CC, E_WARNING,"Cannot get pgsql link");
 		RETURN_FALSE;
 	}
 #ifdef HAVE_PQESCAPELITERAL
-	if (escape_literal) {
-		tmp = PQescapeLiteral(pgsql, from, (size_t)from_len);
-	} else {
-		tmp = PQescapeIdentifier(pgsql, from, (size_t)from_len);
-	}
-	if (!tmp) {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,"Failed to escape");
-		RETURN_FALSE;
+	/* Use a block with a local var to avoid unused variable warnings */
+	{
+		char *tmp;
+
+		if (escape_literal) {
+			tmp = PQescapeLiteral(pgsql, from, (size_t)from_len);
+		} else {
+			tmp = PQescapeIdentifier(pgsql, from, (size_t)from_len);
+		}
+		if (!tmp) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING,"Failed to escape");
+			RETURN_FALSE;
+		}
+		to = estrdup(tmp);
+		PQfreemem(tmp);
 	}
-	to = estrdup(tmp);
-	PQfreemem(tmp);
 #else 
 	to = php_pgsql_PQescapeInternal(pgsql, from, (size_t)from_len, escape_literal);
 	if (!to) {
@@ -4573,6 +4657,7 @@ PHP_FUNCTION(pg_send_query)
 	PGconn *pgsql;
 	PGresult *res;
 	int leftover = 0;
+	int ret;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs",
 							  &pgsql_link, &query, &len) == FAILURE) {
@@ -4600,6 +4685,14 @@ PHP_FUNCTION(pg_send_query)
 			RETURN_FALSE;
 		}
 	}
+	/* Wait to finish sending buffer */
+	while ((ret = PQflush(pgsql))) {
+		if (ret == -1) {
+			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not empty PostgreSQL send buffer");
+			break;
+		}
+		usleep(10000);
+	}
 	if (PQ_SETNONBLOCKING(pgsql, 0)) {
 		php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Cannot set connection to blocking mode");
 	}
@@ -4620,6 +4713,7 @@ PHP_FUNCTION(pg_send_query_params)
 	PGconn *pgsql;
 	PGresult *res;
 	int leftover = 0;
+	int ret;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsa/", &pgsql_link, &query, &query_len, &pv_param_arr) == FAILURE) {
 		return;
@@ -4686,6 +4780,14 @@ PHP_FUNCTION(pg_send_query_params)
 		}
 	}
 	_php_pgsql_free_params(params, num_params);
+	/* Wait to finish sending buffer */
+	while ((ret = PQflush(pgsql))) {
+		if (ret == -1) {
+			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not empty PostgreSQL send buffer");
+			break;
+		}
+		usleep(10000);
+	}
 	if (PQ_SETNONBLOCKING(pgsql, 0)) {
 		php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Cannot set connection to blocking mode");
 	}
@@ -4705,6 +4807,7 @@ PHP_FUNCTION(pg_send_prepare)
 	PGconn *pgsql;
 	PGresult *res;
 	int leftover = 0;
+	int ret;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &pgsql_link, &stmtname, &stmtname_len, &query, &query_len) == FAILURE) {
 		return;
@@ -4735,6 +4838,14 @@ PHP_FUNCTION(pg_send_prepare)
 			RETURN_FALSE;
 		}
 	}
+	/* Wait to finish sending buffer */
+	while ((ret = PQflush(pgsql))) {
+		if (ret == -1) {
+			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not empty postgres send buffer");
+			break;
+		}
+		usleep(10000);
+	}
 	if (PQ_SETNONBLOCKING(pgsql, 0)) {
 		php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Cannot set connection to blocking mode");
 	}
@@ -4757,6 +4868,7 @@ PHP_FUNCTION(pg_send_execute)
 	PGconn *pgsql;
 	PGresult *res;
 	int leftover = 0;
+	int ret;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsa", &pgsql_link, &stmtname, &stmtname_len, &pv_param_arr) == FAILURE) {
 		return;
@@ -4823,6 +4935,14 @@ PHP_FUNCTION(pg_send_execute)
 		}
 	}
 	_php_pgsql_free_params(params, num_params);
+	/* Wait to finish sending buffer */
+	while ((ret = PQflush(pgsql))) {
+		if (ret == -1) {
+			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not empty postgres send buffer");
+			break;
+		}
+		usleep(10000);
+	}
 	if (PQ_SETNONBLOCKING(pgsql, 0)) {
 		php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Cannot set connection to blocking mode");
 	}
@@ -4978,8 +5098,9 @@ PHP_PGSQL_API int php_pgsql_meta_data(PGconn *pg_link, const char *table_name, z
 {
 	PGresult *pg_result;
 	char *src, *tmp_name, *tmp_name2 = NULL;
+	char *escaped;
 	smart_str querystr = {0};
-	int new_len;
+	size_t new_len;
 	int i, num_rows;
 	zval *elem;
 	
@@ -4998,23 +5119,36 @@ PHP_PGSQL_API int php_pgsql_meta_data(PGconn *pg_link, const char *table_name, z
 	}
 
 	smart_str_appends(&querystr, 
-			"SELECT a.attname, a.attnum, t.typname, a.attlen, a.attnotNULL, a.atthasdef, a.attndims "
+			"SELECT a.attname, a.attnum, t.typname, a.attlen, a.attnotnull, a.atthasdef, a.attndims, t.typtype = 'e' "
 			"FROM pg_class as c, pg_attribute a, pg_type t, pg_namespace n "
 			"WHERE a.attnum > 0 AND a.attrelid = c.oid AND c.relname = '");
-	tmp_name2 = php_addslashes(tmp_name2, strlen(tmp_name2), &new_len, 0 TSRMLS_CC);
-	smart_str_appendl(&querystr, tmp_name2, new_len);
-	
+	escaped = (char *)safe_emalloc(strlen(tmp_name2), 2, 1);
+#if HAVE_PQESCAPE_CONN
+	new_len = PQescapeStringConn(pg_link, escaped, tmp_name2, strlen(tmp_name2), NULL);
+#else
+	new_len = PQescapeString(escaped, tmp_name2, strlen(tmp_name2));
+#endif
+	if (new_len) {
+		smart_str_appends(&querystr, escaped);
+	}
+	efree(escaped);
+
 	smart_str_appends(&querystr, "' AND c.relnamespace = n.oid AND n.nspname = '");
-	tmp_name = php_addslashes(tmp_name, strlen(tmp_name), &new_len, 0 TSRMLS_CC);
-	smart_str_appendl(&querystr, tmp_name, new_len);
+	escaped = (char *)safe_emalloc(strlen(tmp_name), 2, 1);
+#if HAVE_PQESCAPE_CONN
+	new_len = PQescapeStringConn(pg_link, escaped, tmp_name, strlen(tmp_name), NULL);
+#else
+	new_len = PQescapeString(escaped, tmp_name, strlen(tmp_name));
+#endif
+	if (new_len) {
+		smart_str_appends(&querystr, escaped);
+	}
+	efree(escaped);
 
 	smart_str_appends(&querystr, "' AND a.atttypid = t.oid ORDER BY a.attnum;");
 	smart_str_0(&querystr);
-	
-	efree(tmp_name2);
-	efree(tmp_name);
-	efree(src);	
-	
+	efree(src);
+
 	pg_result = PQexec(pg_link, querystr.c);
 	if (PQresultStatus(pg_result) != PGRES_TUPLES_OK || (num_rows = PQntuples(pg_result)) == 0) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Table '%s' doesn't exists", table_name);
@@ -5044,6 +5178,12 @@ PHP_PGSQL_API int php_pgsql_meta_data(PGconn *pg_link, const char *table_name, z
 			add_assoc_bool(elem, "has default", 0);
 		}
 		add_assoc_long(elem, "array dims", atoi(PQgetvalue(pg_result,i,6)));
+		if (!strcmp(PQgetvalue(pg_result,i,7), "t")) {
+			add_assoc_bool(elem, "is enum", 1);
+		}
+		else {
+			add_assoc_bool(elem, "is enum", 0);
+		}
 		name = PQgetvalue(pg_result,i,0);
 		add_assoc_zval(meta, name, elem);
 	}
@@ -5077,7 +5217,18 @@ PHP_FUNCTION(pg_meta_data)
 		zval_dtor(return_value); /* destroy array */
 		RETURN_FALSE;
 	}
-} 
+	else {
+		HashPosition pos;
+		zval **val;
+
+		for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(return_value), &pos);
+			zend_hash_get_current_data_ex(Z_ARRVAL_P(return_value), (void **)&val, &pos) == SUCCESS;
+			zend_hash_move_forward_ex(Z_ARRVAL_P(return_value), &pos)) {
+			/* delete newly added entry, in order to keep BC */
+			zend_hash_del_key_or_index(Z_ARRVAL_PP(val), "is enum", sizeof("is enum"), 0, HASH_DEL_KEY);
+		}
+	}
+}
 /* }}} */
 
 /* {{{ php_pgsql_get_data_type
@@ -5220,6 +5371,7 @@ static int php_pgsql_add_quotes(zval *src, zend_bool should_free TSRMLS_DC)
 	assert(Z_TYPE_P(src) == IS_STRING);
 	assert(should_free == 1 || should_free == 0);
 
+	smart_str_appendc(&str, 'E');
 	smart_str_appendc(&str, '\'');
 	smart_str_appendl(&str, Z_STRVAL_P(src), Z_STRLEN_P(src));
 	smart_str_appendc(&str, '\'');
@@ -5259,8 +5411,9 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
 	char *field = NULL;
 	uint field_len = -1;
 	ulong num_idx = -1;
-	zval *meta, **def, **type, **not_null, **has_default, **val, *new_val;
-	int new_len, key_type, err = 0, skip_field;
+	zval *meta, **def, **type, **not_null, **has_default, **is_enum, **val, *new_val;
+	int key_type, err = 0, skip_field;
+	php_pgsql_data_type data_type;
 	
 	assert(pg_link != NULL);
 	assert(Z_TYPE_P(values) == IS_ARRAY);
@@ -5272,6 +5425,8 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
 	}
 	MAKE_STD_ZVAL(meta);
 	array_init(meta);
+
+/* table_name is escaped by php_pgsql_meta_data */
 	if (php_pgsql_meta_data(pg_link, table_name, meta TSRMLS_CC) == FAILURE) {
 		zval_dtor(meta);
 		FREE_ZVAL(meta);
@@ -5311,17 +5466,30 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
 			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Detected broken meta data. Missing 'has default'");
 			err = 1;
 		}
+		if (!err && zend_hash_find(Z_ARRVAL_PP(def), "is enum", sizeof("is enum"), (void **)&is_enum) == FAILURE) {
+			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Detected broken meta data. Missing 'is enum'");
+			err = 1;
+		}
 		if (!err && (Z_TYPE_PP(val) == IS_ARRAY ||
 			 Z_TYPE_PP(val) == IS_OBJECT ||
 			 Z_TYPE_PP(val) == IS_CONSTANT_ARRAY)) {
-			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Expects scaler values as field values");
+			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Expects scalar values as field values");
 			err = 1;
 		}
 		if (err) {
 			break; /* break out for() */
 		}
 		ALLOC_INIT_ZVAL(new_val);
-		switch(php_pgsql_get_data_type(Z_STRVAL_PP(type), Z_STRLEN_PP(type)))
+
+		if (Z_BVAL_PP(is_enum)) {
+			/* enums need to be treated like strings */
+			data_type = PG_TEXT;
+		}
+		else {
+			data_type = php_pgsql_get_data_type(Z_STRVAL_PP(type), Z_STRLEN_PP(type));
+		}
+
+		switch(data_type)
 		{
 			case PG_BOOL:
 				switch (Z_TYPE_PP(val)) {
@@ -5471,15 +5639,15 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
 						}
 						else {
 							Z_TYPE_P(new_val) = IS_STRING;
-#if HAVE_PQESCAPE
+#if HAVE_PQESCAPE_CONN
 							{
 								char *tmp;
-	 							tmp = (char *)safe_emalloc(Z_STRLEN_PP(val), 2, 1);
-								Z_STRLEN_P(new_val) = (int)PQescapeString(tmp, Z_STRVAL_PP(val), Z_STRLEN_PP(val));
+								tmp = (char *)safe_emalloc(Z_STRLEN_PP(val), 2, 1);
+								Z_STRLEN_P(new_val) = (int)PQescapeStringConn(pg_link, tmp, Z_STRVAL_PP(val), Z_STRLEN_PP(val), NULL);
 								Z_STRVAL_P(new_val) = tmp;
 							}
 #else					
-							Z_STRVAL_P(new_val) = php_addslashes(Z_STRVAL_PP(val), Z_STRLEN_PP(val), &Z_STRLEN_P(new_val), 0 TSRMLS_CC);
+							Z_STRVAL_P(new_val) = (int)PQescapeString(Z_STRVAL_PP(val), Z_STRLEN_PP(val), &Z_STRLEN_P(new_val), 0 TSRMLS_CC);
 #endif
 							php_pgsql_add_quotes(new_val, 1 TSRMLS_CC);
 						}
@@ -5765,10 +5933,11 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
 						else {
 							unsigned char *tmp;
 							size_t to_len;
+							smart_str s = {0};
 #ifdef HAVE_PQESCAPE_BYTEA_CONN
-							tmp = PQescapeByteaConn(pg_link, Z_STRVAL_PP(val), Z_STRLEN_PP(val), &to_len);
+							tmp = PQescapeByteaConn(pg_link, (unsigned char *)Z_STRVAL_PP(val), Z_STRLEN_PP(val), &to_len);
 #else
-							tmp = PQescapeBytea(Z_STRVAL_PP(val), Z_STRLEN_PP(val), &to_len);
+							tmp = PQescapeBytea(Z_STRVAL_PP(val), (unsigned char *)Z_STRLEN_PP(val), &to_len);
 #endif
 							Z_TYPE_P(new_val) = IS_STRING;
 							Z_STRLEN_P(new_val) = to_len-1; /* PQescapeBytea's to_len includes additional '\0' */
@@ -5776,7 +5945,11 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
 							memcpy(Z_STRVAL_P(new_val), tmp, to_len);
 							PQfreemem(tmp);
 							php_pgsql_add_quotes(new_val, 1 TSRMLS_CC);
-								
+							smart_str_appendl(&s, Z_STRVAL_P(new_val), Z_STRLEN_P(new_val));
+							smart_str_0(&s);
+							efree(Z_STRVAL_P(new_val));
+							Z_STRVAL_P(new_val) = s.c;
+							Z_STRLEN_P(new_val) = s.len;
 						}
 						break;
 						
@@ -5861,11 +6034,22 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
 			FREE_ZVAL(new_val);
 			break; /* break out for() */
 		}
+		/* If field is NULL and HAS DEFAULT, should be skipped */
 		if (!skip_field) {
-			/* If field is NULL and HAS DEFAULT, should be skipped */
-			field = php_addslashes(field, strlen(field), &new_len, 0 TSRMLS_CC);
-			add_assoc_zval(result, field, new_val);
-			efree(field);
+			char *escaped;
+			size_t field_len = strlen(field);
+
+			if (_php_pgsql_detect_identifier_escape(field, field_len) == SUCCESS) {
+				escaped = _php_pgsql_strndup(field, field_len);
+			} else {
+#if HAVE_PQESCAPELITERAL
+				escaped = PQescapeIdentifier(pg_link, field, field_len);
+#else
+				escaped = _php_pgsql_escape_identifier(field, field_len);
+#endif
+			}
+			add_assoc_zval(result, escaped, new_val);
+			free(escaped);
 		}
 	} /* for */
 	zval_dtor(meta);
@@ -5940,6 +6124,45 @@ static int do_exec(smart_str *querystr, int expect, PGconn *pg_link, ulong opt T
 	return -1;
 }
 
+static inline void build_tablename(smart_str *querystr, PGconn *pg_link, const char *table)
+{
+	char *table_copy, *escaped, *token, *tmp;
+	size_t len;
+
+	/* schame.table should be "schame"."table" */
+	table_copy = estrdup(table);
+	token = php_strtok_r(table_copy, ".", &tmp);
+	len = strlen(token);
+	if (_php_pgsql_detect_identifier_escape(token, len) == SUCCESS) {
+		escaped = _php_pgsql_strndup(token, len);
+	} else {
+#if HAVE_PQESCAPELITERAL
+		escaped = PQescapeIdentifier(pg_link, token, len);
+#else
+		escaped = _php_pgsql_escape_identifier(token, len);
+#endif
+	}
+	smart_str_appends(querystr, escaped);
+	free(escaped);
+	if (tmp && *tmp) {
+		len = strlen(tmp);
+		/* "schema"."table" format */
+		if (_php_pgsql_detect_identifier_escape(tmp, len) == SUCCESS) {
+			escaped = _php_pgsql_strndup(tmp, len);
+		} else {
+#if HAVE_PQESCAPELITERAL
+			escaped = PQescapeIdentifier(pg_link, tmp, len);
+#else
+			escaped = _php_pgsql_escape_identifier(tmp, len);
+#endif
+		}
+		smart_str_appendc(querystr, '.');
+		smart_str_appends(querystr, escaped);
+		free(escaped);
+	}
+	efree(table_copy);
+}
+
 /* {{{ php_pgsql_insert
  */
 PHP_PGSQL_API int php_pgsql_insert(PGconn *pg_link, const char *table, zval *var_array, ulong opt, char **sql TSRMLS_DC)
@@ -5959,7 +6182,7 @@ PHP_PGSQL_API int php_pgsql_insert(PGconn *pg_link, const char *table, zval *var
 
 	if (zend_hash_num_elements(Z_ARRVAL_P(var_array)) == 0) {
 		smart_str_appends(&querystr, "INSERT INTO ");
-		smart_str_appends(&querystr, table);
+		build_tablename(&querystr, pg_link, table);
 		smart_str_appends(&querystr, " DEFAULT VALUES");
 
 		goto no_values;
@@ -5974,11 +6197,11 @@ PHP_PGSQL_API int php_pgsql_insert(PGconn *pg_link, const char *table, zval *var
 		}
 		var_array = converted;
 	}
-	
+
 	smart_str_appends(&querystr, "INSERT INTO ");
-	smart_str_appends(&querystr, table);
+	build_tablename(&querystr, pg_link, table);
 	smart_str_appends(&querystr, " (");
-	
+
 	zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(var_array), &pos);
 	while ((key_type = zend_hash_get_current_key_ex(Z_ARRVAL_P(var_array), &fld,
 					&fld_len, &num_idx, 0, &pos)) != HASH_KEY_NON_EXISTANT) {
@@ -6165,7 +6388,7 @@ PHP_PGSQL_API int php_pgsql_update(PGconn *pg_link, const char *table, zval *var
 	}
 
 	smart_str_appends(&querystr, "UPDATE ");
-	smart_str_appends(&querystr, table);
+	build_tablename(&querystr, pg_link, table);
 	smart_str_appends(&querystr, " SET ");
 
 	if (build_assignment_string(&querystr, Z_ARRVAL_P(var_array), 0, ",", 1 TSRMLS_CC))
@@ -6266,7 +6489,7 @@ PHP_PGSQL_API int php_pgsql_delete(PGconn *pg_link, const char *table, zval *ids
 	}
 
 	smart_str_appends(&querystr, "DELETE FROM ");
-	smart_str_appends(&querystr, table);
+	build_tablename(&querystr, pg_link, table);
 	smart_str_appends(&querystr, " WHERE ");
 
 	if (build_assignment_string(&querystr, Z_ARRVAL_P(ids_array), 1, " AND ", sizeof(" AND ")-1 TSRMLS_CC))
@@ -6402,7 +6625,7 @@ PHP_PGSQL_API int php_pgsql_select(PGconn *pg_link, const char *table, zval *ids
 	}
 
 	smart_str_appends(&querystr, "SELECT * FROM ");
-	smart_str_appends(&querystr, table);
+	build_tablename(&querystr, pg_link, table);
 	smart_str_appends(&querystr, " WHERE ");
 
 	if (build_assignment_string(&querystr, Z_ARRVAL_P(ids_array), 1, " AND ", sizeof(" AND ")-1 TSRMLS_CC))
diff --git a/ext/pgsql/tests/08escape.phpt b/ext/pgsql/tests/08escape.phpt
index 90b4ed8a9..1bea35bf1 100644
--- a/ext/pgsql/tests/08escape.phpt
+++ b/ext/pgsql/tests/08escape.phpt
@@ -48,15 +48,24 @@ $sql = "INSERT INTO ".$table_name." (num, bin) VALUES (-9999, CAST ('".$escaped_
 pg_query($db, $sql);
 
 // Retrieve binary from DB
-$sql = "SELECT bin::bytea FROM ".$table_name." WHERE num = -9999";
-$result = pg_query($db, $sql);
-$row = pg_fetch_array($result, 0, PGSQL_ASSOC);
+for ($i = 0; $i < 2; $i++) {
+	$sql = "SELECT bin::bytea FROM ".$table_name." WHERE num = -9999";
+	$result = pg_query($db, $sql);
+	$row = pg_fetch_array($result, 0, PGSQL_ASSOC);
 
-if ($data === pg_unescape_bytea($row['bin'])) {
-	echo "pg_escape_bytea() actually works with database\n";
-}
-else {
-	echo "pg_escape_bytea() is broken\n";
+	if ($data === pg_unescape_bytea($row['bin'])) {
+		echo "pg_escape_bytea() actually works with database\n";
+		break;
+	}
+	elseif (!$i) {
+		// Force bytea escaping and retry
+		@pg_query($db, "SET bytea_output = 'escape'");
+	}
+	else {
+		$result = pg_query($db, $sql);
+		echo "pg_escape_bytea() is broken\n";
+		break;
+	}
 }
 
 // pg_escape_literal/pg_escape_identifier
@@ -92,4 +101,4 @@ pg_escape_string() is Ok
 pg_escape_bytea() is Ok
 pg_escape_bytea() actually works with database
 pg_escape_literal() is Ok
-pg_escape_identifier() is Ok
\ No newline at end of file
+pg_escape_identifier() is Ok
diff --git a/ext/pgsql/tests/09notice.phpt b/ext/pgsql/tests/09notice.phpt
index 316706916..67ef262fc 100644
--- a/ext/pgsql/tests/09notice.phpt
+++ b/ext/pgsql/tests/09notice.phpt
@@ -10,7 +10,7 @@ _skip_lc_messages();
 ?>
 --INI--
 pgsql.log_notice=1
-pgsql.ignore_notices=0
+pgsql.ignore_notice=0
 --FILE--
 <?php
 include 'config.inc';
diff --git a/ext/pgsql/tests/10pg_convert.phpt b/ext/pgsql/tests/10pg_convert.phpt
index 73bf2b64e..adc2756e2 100644
--- a/ext/pgsql/tests/10pg_convert.phpt
+++ b/ext/pgsql/tests/10pg_convert.phpt
@@ -3,7 +3,7 @@ PostgreSQL pg_convert()
 --SKIPIF--
 <?php
 include("skipif.inc");
-skip_server_version('8.5dev', '>=');
+skip_bytea_not_escape();
 ?>
 --FILE--
 <?php
@@ -20,10 +20,10 @@ var_dump($converted);
 ?>
 --EXPECT--
 array(3) {
-  ["num"]=>
+  [""num""]=>
   string(4) "1234"
-  ["str"]=>
-  string(5) "'AAA'"
-  ["bin"]=>
-  string(5) "'BBB'"
-}
+  [""str""]=>
+  string(6) "E'AAA'"
+  [""bin""]=>
+  string(6) "E'BBB'"
+}
\ No newline at end of file
diff --git a/ext/pgsql/tests/10pg_convert_85.phpt b/ext/pgsql/tests/10pg_convert_9.phpt
index 4f1c92bf1..827c96250 100644
--- a/ext/pgsql/tests/10pg_convert_85.phpt
+++ b/ext/pgsql/tests/10pg_convert_9.phpt
@@ -1,9 +1,9 @@
 --TEST--
-PostgreSQL pg_convert() (8.5+)
+PostgreSQL pg_convert() (9.0+)
 --SKIPIF--
 <?php
 include("skipif.inc");
-skip_server_version('8.5dev', '<');
+skip_bytea_not_hex();
 ?>
 --FILE--
 <?php
@@ -12,6 +12,7 @@ error_reporting(E_ALL);
 include 'config.inc';
 
 $db = pg_connect($conn_str);
+pg_query($db, "SET standard_conforming_strings = 0");
 
 $fields = array('num'=>'1234', 'str'=>'AAA', 'bin'=>'BBB');
 $converted = pg_convert($db, $table_name, $fields);
@@ -20,10 +21,10 @@ var_dump($converted);
 ?>
 --EXPECT--
 array(3) {
-  ["num"]=>
+  [""num""]=>
   string(4) "1234"
-  ["str"]=>
-  string(5) "'AAA'"
-  ["bin"]=>
-  string(11) "'\\x424242'"
-}
+  [""str""]=>
+  string(6) "E'AAA'"
+  [""bin""]=>
+  string(12) "E'\\x424242'"
+}
\ No newline at end of file
diff --git a/ext/pgsql/tests/12pg_insert.phpt b/ext/pgsql/tests/12pg_insert.phpt
index f5cd868f8..9fd0dd1e3 100644
--- a/ext/pgsql/tests/12pg_insert.phpt
+++ b/ext/pgsql/tests/12pg_insert.phpt
@@ -3,7 +3,7 @@ PostgreSQL pg_insert()
 --SKIPIF--
 <?php
 include("skipif.inc");
-skip_server_version('8.5dev', '>=');
+skip_bytea_not_escape();
 ?>
 --FILE--
 <?php
@@ -20,5 +20,5 @@ echo pg_insert($db, $table_name, $fields, PGSQL_DML_STRING)."\n";
 echo "Ok\n";
 ?>
 --EXPECT--
-INSERT INTO php_pgsql_test (num,str,bin) VALUES (1234,'AAA','BBB');
-Ok
+INSERT INTO "php_pgsql_test" ("num","str","bin") VALUES (1234,E'AAA',E'BBB');
+Ok
\ No newline at end of file
diff --git a/ext/pgsql/tests/12pg_insert_85.phpt b/ext/pgsql/tests/12pg_insert_9.phpt
index a85dea036..329364ad6 100644
--- a/ext/pgsql/tests/12pg_insert_85.phpt
+++ b/ext/pgsql/tests/12pg_insert_9.phpt
@@ -1,9 +1,9 @@
 --TEST--
-PostgreSQL pg_insert() (8.5+)
+PostgreSQL pg_insert() (9.0+)
 --SKIPIF--
 <?php
 include("skipif.inc");
-skip_server_version('8.5dev', '<');
+skip_bytea_not_hex();
 ?>
 --FILE--
 <?php
@@ -12,6 +12,8 @@ error_reporting(E_ALL);
 include 'config.inc';
 
 $db = pg_connect($conn_str);
+pg_query($db, "SET standard_conforming_strings = 0");
+
 $fields = array('num'=>'1234', 'str'=>'AAA', 'bin'=>'BBB');
 
 pg_insert($db, $table_name, $fields) or print "Error in test 1\n";
@@ -20,5 +22,5 @@ echo pg_insert($db, $table_name, $fields, PGSQL_DML_STRING)."\n";
 echo "Ok\n";
 ?>
 --EXPECT--
-INSERT INTO php_pgsql_test (num,str,bin) VALUES (1234,'AAA','\\x424242');
-Ok
+INSERT INTO "php_pgsql_test" ("num","str","bin") VALUES (1234,E'AAA',E'\\x424242');
+Ok
\ No newline at end of file
diff --git a/ext/pgsql/tests/13pg_select.phpt b/ext/pgsql/tests/13pg_select.phpt
index f1504a8b1..db2ca06bf 100644
--- a/ext/pgsql/tests/13pg_select.phpt
+++ b/ext/pgsql/tests/13pg_select.phpt
@@ -33,5 +33,5 @@ array(1) {
     string(3) "BBB"
   }
 }
-SELECT * FROM php_pgsql_test WHERE num=1234;
+SELECT * FROM "php_pgsql_test" WHERE "num"=1234;
 Ok
diff --git a/ext/pgsql/tests/13pg_select_85.phpt b/ext/pgsql/tests/13pg_select_9.phpt
index e6d86bd6f..67adc9d21 100644
--- a/ext/pgsql/tests/13pg_select_85.phpt
+++ b/ext/pgsql/tests/13pg_select_9.phpt
@@ -1,9 +1,9 @@
 --TEST--
-PostgreSQL pg_select() (8.5+)
+PostgreSQL pg_select() (9.0+)
 --SKIPIF--
 <?php
 include("skipif.inc");
-skip_server_version('8.5dev', '<');
+skip_server_version('9.0', '<');
 ?>
 --FILE--
 <?php
@@ -12,6 +12,8 @@ error_reporting(E_ALL);
 include 'config.inc';
 
 $db = pg_connect($conn_str);
+pg_query("SET bytea_output = 'hex'");
+
 $fields = array('num'=>'1234', 'str'=>'ABC', 'bin'=>'XYZ');
 $ids = array('num'=>'1234');
 
@@ -33,5 +35,5 @@ array(1) {
     string(8) "\x424242"
   }
 }
-SELECT * FROM php_pgsql_test WHERE num=1234;
-Ok
+SELECT * FROM "php_pgsql_test" WHERE "num"=1234;
+Ok
\ No newline at end of file
diff --git a/ext/pgsql/tests/14pg_update.phpt b/ext/pgsql/tests/14pg_update.phpt
index b41dd1af8..347cac944 100644
--- a/ext/pgsql/tests/14pg_update.phpt
+++ b/ext/pgsql/tests/14pg_update.phpt
@@ -3,7 +3,7 @@ PostgreSQL pg_update()
 --SKIPIF--
 <?php
 include("skipif.inc");
-skip_server_version('8.5dev', '>=');
+skip_bytea_not_escape();
 ?>
 --FILE--
 <?php
@@ -21,5 +21,5 @@ echo pg_update($db, $table_name, $fields, $ids, PGSQL_DML_STRING)."\n";
 echo "Ok\n";
 ?>
 --EXPECT--
-UPDATE php_pgsql_test SET num=1234,str='ABC',bin='XYZ' WHERE num=1234;
-Ok
+UPDATE "php_pgsql_test" SET "num"=1234,"str"=E'ABC',"bin"=E'XYZ' WHERE "num"=1234;
+Ok
\ No newline at end of file
diff --git a/ext/pgsql/tests/14pg_update_85.phpt b/ext/pgsql/tests/14pg_update_9.phpt
index f1c77eac1..e766c1f38 100644
--- a/ext/pgsql/tests/14pg_update_85.phpt
+++ b/ext/pgsql/tests/14pg_update_9.phpt
@@ -1,9 +1,9 @@
 --TEST--
-PostgreSQL pg_update() (8.5+)
+PostgreSQL pg_update() (9.0)
 --SKIPIF--
 <?php
 include("skipif.inc");
-skip_server_version('8.5dev', '<');
+skip_bytea_not_hex();
 ?>
 --FILE--
 <?php
@@ -12,6 +12,8 @@ error_reporting(E_ALL);
 include 'config.inc';
 
 $db = pg_connect($conn_str);
+pg_query($db, "SET standard_conforming_strings = 0");
+
 $fields = array('num'=>'1234', 'str'=>'ABC', 'bin'=>'XYZ');
 $ids = array('num'=>'1234');
 
@@ -21,5 +23,5 @@ echo pg_update($db, $table_name, $fields, $ids, PGSQL_DML_STRING)."\n";
 echo "Ok\n";
 ?>
 --EXPECT--
-UPDATE php_pgsql_test SET num=1234,str='ABC',bin='\\x58595a' WHERE num=1234;
-Ok
+UPDATE "php_pgsql_test" SET "num"=1234,"str"=E'ABC',"bin"=E'\\x58595a' WHERE "num"=1234;
+Ok
\ No newline at end of file
diff --git a/ext/pgsql/tests/18pg_escape_bytea_before.phpt b/ext/pgsql/tests/18pg_escape_bytea_before.phpt
new file mode 100644
index 000000000..492517733
--- /dev/null
+++ b/ext/pgsql/tests/18pg_escape_bytea_before.phpt
@@ -0,0 +1,30 @@
+--TEST--
+PostgreSQL pg_escape_bytea() functions (before connection)
+--SKIPIF--
+<?php include("skipif.inc"); ?>
+--FILE--
+<?php
+// optional functions
+
+include('config.inc');
+
+$image = file_get_contents(dirname(__FILE__) . '/php.gif');
+$esc_image = pg_escape_bytea($image);
+
+$db = pg_connect($conn_str);
+@pg_query($db, "SET bytea_output = 'escape'");
+
+pg_query($db, 'INSERT INTO '.$table_name.' (num, bin) VALUES (9876, E\''.$esc_image.'\');');
+$result = pg_query($db, 'SELECT * FROM '.$table_name.' WHERE num = 9876');
+$rows = pg_fetch_all($result);
+$unesc_image = pg_unescape_bytea($rows[0]['bin']);
+
+if ($unesc_image !== $image) {
+	echo "NG";
+}
+else {
+	echo "OK";
+}
+?>
+--EXPECT--
+OK
diff --git a/ext/pgsql/tests/18pg_escape_bytea.phpt b/ext/pgsql/tests/18pg_escape_bytea_esc.phpt
index 43f98c446..38e5777c3 100644
--- a/ext/pgsql/tests/18pg_escape_bytea.phpt
+++ b/ext/pgsql/tests/18pg_escape_bytea_esc.phpt
@@ -1,5 +1,5 @@
 --TEST--
-PostgreSQL pg_escape_bytea() functions
+PostgreSQL pg_escape_bytea() functions (escape format)
 --SKIPIF--
 <?php include("skipif.inc"); ?>
 --FILE--
@@ -8,10 +8,12 @@ PostgreSQL pg_escape_bytea() functions
 
 include('config.inc');
 
+$db = pg_connect($conn_str);
+@pg_query($db, "SET bytea_output = 'escape'");
+
 $image = file_get_contents(dirname(__FILE__) . '/php.gif');
 $esc_image = pg_escape_bytea($image);
 
-$db = pg_connect($conn_str);
 pg_query($db, 'INSERT INTO '.$table_name.' (num, bin) VALUES (9876, \''.$esc_image.'\');');
 $result = pg_query($db, 'SELECT * FROM '.$table_name.' WHERE num = 9876');
 $rows = pg_fetch_all($result);
diff --git a/ext/pgsql/tests/18pg_escape_bytea_hex.phpt b/ext/pgsql/tests/18pg_escape_bytea_hex.phpt
new file mode 100644
index 000000000..04630bbbf
--- /dev/null
+++ b/ext/pgsql/tests/18pg_escape_bytea_hex.phpt
@@ -0,0 +1,33 @@
+--TEST--
+PostgreSQL pg_escape_bytea() functions (hex format)
+--SKIPIF--
+<?php
+include("skipif.inc");
+skip_bytea_not_hex();
+?>
+--FILE--
+<?php
+// optional functions
+
+include('config.inc');
+
+$db = pg_connect($conn_str);
+@pg_query($db, "SET bytea_output = 'hex'");
+
+$image = file_get_contents(dirname(__FILE__) . '/php.gif');
+$esc_image = pg_escape_bytea($image);
+
+pg_query($db, 'INSERT INTO '.$table_name.' (num, bin) VALUES (9876, \''.$esc_image.'\');');
+$result = pg_query($db, 'SELECT * FROM '.$table_name.' WHERE num = 9876');
+$rows = pg_fetch_all($result);
+$unesc_image = pg_unescape_bytea($rows[0]['bin']);
+
+if ($unesc_image !== $image) {
+	echo "NG";
+}
+else {
+	echo "OK";
+}
+?>
+--EXPECT--
+OK
diff --git a/ext/pgsql/tests/80_bug32223.phpt b/ext/pgsql/tests/80_bug32223.phpt
index 573742c6e..cad5fb3a1 100644
--- a/ext/pgsql/tests/80_bug32223.phpt
+++ b/ext/pgsql/tests/80_bug32223.phpt
@@ -15,6 +15,8 @@ end;
 ' LANGUAGE plpgsql;");
 if (!$res) die('skip PLPGSQL not available');
 ?>
+--INI--
+pgsql.ignore_notice=0
 --FILE--
 <?php
 
diff --git a/ext/pgsql/tests/80_bug32223b.phpt b/ext/pgsql/tests/80_bug32223b.phpt
index aada3f01b..e79685c43 100644
--- a/ext/pgsql/tests/80_bug32223b.phpt
+++ b/ext/pgsql/tests/80_bug32223b.phpt
@@ -15,6 +15,8 @@ end;
 ' LANGUAGE plpgsql;");
 if (!$res) die('skip PLPGSQL not available');
 ?>
+--INI--
+pgsql.ignore_notice=0
 --FILE--
 <?php
 
diff --git a/ext/pgsql/tests/80_bug36625.phpt b/ext/pgsql/tests/80_bug36625.phpt
index a95cea711..9cc8a1d4f 100644
--- a/ext/pgsql/tests/80_bug36625.phpt
+++ b/ext/pgsql/tests/80_bug36625.phpt
@@ -37,6 +37,8 @@ array_walk($trace, 'search_trace_file');
 var_dump($found > 0);
 var_dump(file_exists($tracefile));
 
+@unlink($tracefile);
+
 ?>
 ===DONE===
 --CLEAN--
diff --git a/ext/pgsql/tests/bug37100.phpt b/ext/pgsql/tests/bug37100.phpt
index fa6b9ba9e..3faecc671 100644
--- a/ext/pgsql/tests/bug37100.phpt
+++ b/ext/pgsql/tests/bug37100.phpt
@@ -3,7 +3,7 @@ Bug #37100 (data is returned truncated with BINARY CURSOR)
 --SKIPIF--
 <?php
 include("skipif.inc");
-skip_server_version('8.5dev', '>=');
+skip_bytea_not_escape();
 ?>
 --FILE--
 <?php
@@ -11,6 +11,7 @@ skip_server_version('8.5dev', '>=');
 include 'config.inc';
 
 $db = pg_connect($conn_str);
+@pg_query("SET bytea_output = 'escape'");
 
 @pg_query('DROP TABLE test_bug');
 
diff --git a/ext/pgsql/tests/bug37100_85.phpt b/ext/pgsql/tests/bug37100_9.phpt
index aa2477626..9f4160d12 100644
--- a/ext/pgsql/tests/bug37100_85.phpt
+++ b/ext/pgsql/tests/bug37100_9.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Bug #37100 (data is returned truncated with BINARY CURSOR) (8.5+)
+Bug #37100 (data is returned truncated with BINARY CURSOR) (9.0+)
 --SKIPIF--
 <?php
 include("skipif.inc");
-skip_server_version('8.5dev', '<');
+skip_bytea_not_hex();
 ?>
 --FILE--
 <?php
diff --git a/ext/pgsql/tests/bug47199.phpt b/ext/pgsql/tests/bug47199.phpt
index 5bfac0b1b..faa787fd5 100644
--- a/ext/pgsql/tests/bug47199.phpt
+++ b/ext/pgsql/tests/bug47199.phpt
@@ -52,8 +52,8 @@ array(2) {
     string(1) "2"
   }
 }
-DELETE FROM test_47199 WHERE null_field IS NULL AND not_null_field=2;
-UPDATE test_47199 SET null_field=NULL,not_null_field=0 WHERE not_null_field=1 AND null_field IS NULL;
+DELETE FROM "test_47199" WHERE "null_field" IS NULL AND "not_null_field"=2;
+UPDATE "test_47199" SET "null_field"=NULL,"not_null_field"=0 WHERE "not_null_field"=1 AND "null_field" IS NULL;
 array(1) {
   [0]=>
   array(2) {
diff --git a/ext/pgsql/tests/bug64609.phpt b/ext/pgsql/tests/bug64609.phpt
new file mode 100644
index 000000000..72fac7648
--- /dev/null
+++ b/ext/pgsql/tests/bug64609.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Bug #64609 (pg_convert enum type support)
+--SKIPIF--
+<?php
+include("skipif.inc");
+skip_server_version('8.3', '<');
+?>
+--FILE--
+<?php
+error_reporting(E_ALL);
+
+include 'config.inc';
+
+$db = pg_connect($conn_str);
+pg_query("BEGIN");
+pg_query("CREATE TYPE t_enum AS ENUM ('ok', 'ko')");
+pg_query("CREATE TABLE test_enum (a t_enum)");
+
+$fields = array('a' => 'ok');
+$converted = pg_convert($db, 'test_enum', $fields);
+
+pg_query("ROLLBACK");
+
+var_dump($converted);
+?>
+--EXPECT--
+array(1) {
+  [""a""]=>
+  string(5) "E'ok'"
+}
\ No newline at end of file
diff --git a/ext/pgsql/tests/config.inc b/ext/pgsql/tests/config.inc
index 2b5f05a71..d4bbb3382 100644
--- a/ext/pgsql/tests/config.inc
+++ b/ext/pgsql/tests/config.inc
@@ -2,7 +2,7 @@
 // These vars are used to connect db and create test table.
 // values can be set to meet your environment
 
-$conn_str = "host=localhost dbname=test";    // connection string
+$conn_str = "host=localhost dbname=test port=5432";    // connection string
 $table_name = "php_pgsql_test";  // test table that should be exist
 $num_test_record = 1000;         // Number of records to create
 
diff --git a/ext/pgsql/tests/pg_delete_001.phpt b/ext/pgsql/tests/pg_delete_001.phpt
index abb65be14..a98c95dc4 100644
--- a/ext/pgsql/tests/pg_delete_001.phpt
+++ b/ext/pgsql/tests/pg_delete_001.phpt
@@ -45,8 +45,8 @@ pg_query('DROP SCHEMA phptests');
 
 ?>
 --EXPECTF--
-string(37) "DELETE FROM foo WHERE id=1 AND id2=2;"
-string(46) "DELETE FROM phptests.foo WHERE id=2 AND id2=3;"
+string(43) "DELETE FROM "foo" WHERE "id"=1 AND "id2"=2;"
+string(54) "DELETE FROM "phptests"."foo" WHERE "id"=2 AND "id2"=3;"
 array(2) {
   [0]=>
   array(2) {
diff --git a/ext/pgsql/tests/pg_insert_001.phpt b/ext/pgsql/tests/pg_insert_001.phpt
index 7d2721918..626d4d0f8 100644
--- a/ext/pgsql/tests/pg_insert_001.phpt
+++ b/ext/pgsql/tests/pg_insert_001.phpt
@@ -28,7 +28,7 @@ pg_query('DROP SCHEMA phptests');
 --EXPECTF--
 
 Warning: pg_insert(): Table 'foo' doesn't exists in %s on line %d
-string(47) "INSERT INTO phptests.foo (id,id2) VALUES (1,2);"
+string(55) "INSERT INTO "phptests"."foo" ("id","id2") VALUES (1,2);"
 array(1) {
   [0]=>
   array(2) {
diff --git a/ext/pgsql/tests/pg_update_001.phpt b/ext/pgsql/tests/pg_update_001.phpt
index 95fa69256..60db35c15 100644
--- a/ext/pgsql/tests/pg_update_001.phpt
+++ b/ext/pgsql/tests/pg_update_001.phpt
@@ -35,8 +35,8 @@ pg_query('DROP SCHEMA phptests');
 
 ?>
 --EXPECT--
-string(32) "UPDATE foo SET id=10 WHERE id=1;"
-string(43) "UPDATE phptests.foo SET id=100 WHERE id2=2;"
+string(38) "UPDATE "foo" SET "id"=10 WHERE "id"=1;"
+string(51) "UPDATE "phptests"."foo" SET "id"=100 WHERE "id2"=2;"
 array(2) {
   ["id"]=>
   string(2) "10"
diff --git a/ext/pgsql/tests/skipif.inc b/ext/pgsql/tests/skipif.inc
index 7c5153e6f..83904af4f 100644
--- a/ext/pgsql/tests/skipif.inc
+++ b/ext/pgsql/tests/skipif.inc
@@ -17,15 +17,28 @@ if (!is_resource($conn)) {
     die("skip could not connect\n");
 }
 
-function skip_server_version($version, $op = '<') { _skip_version('server', $version, $op); }
-function skip_client_version($version, $op = '<') { _skip_version('client', $version, $op); }
+function skip_server_version($version, $op = '<')
+{
+	$pg = pg_parameter_status('server_version');
+	if (version_compare($pg, $version, $op)) {
+		die("skip Server version {$pg} is {$op} {$version}\n");
+	}
+	return $pg;
+}
 
+function skip_bytea_not_hex()
+{
+	$out = pg_escape_bytea("\xFF");
+	if (strpos($out, '377') !== false) {
+		die("skip libpq or backend < 9.0\n");
+	}
+}
 
-function _skip_version($type, $version, $op)
+function skip_bytea_not_escape()
 {
-	$pg = pg_parameter_status($type.'_version');
-	if (version_compare($pg, $version, $op)) {
-		die("skip {$type} version {$pg} is {$op} {$version}\n");
+	$out = pg_escape_bytea("\xFF");
+	if (strpos($out, '377') === false) {
+		die("skip libpq or backend >= 9.0\n");
 	}
 }
 
diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
index b1c820f27..ed6de9fd6 100644
--- a/ext/phar/Makefile.frag
+++ b/ext/phar/Makefile.frag
@@ -40,3 +40,7 @@ install-pharcmd: pharcmd
 	$(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
 	-@rm -f $(INSTALL_ROOT)$(bindir)/phar
 	$(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar
+	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
+	@$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.1
+	@$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/phar.phar.1
+
diff --git a/ext/phar/config.m4 b/ext/phar/config.m4
index 2ac7f3dd8..d424060f2 100644
--- a/ext/phar/config.m4
+++ b/ext/phar/config.m4
@@ -27,4 +27,6 @@ if test "$PHP_PHAR" != "no"; then
   PHP_ADD_EXTENSION_DEP(phar, hash, true)
   PHP_ADD_EXTENSION_DEP(phar, spl, true)
   PHP_ADD_MAKEFILE_FRAGMENT
+
+  PHP_OUTPUT(ext/phar/phar.1 ext/phar/phar.phar.1)
 fi
diff --git a/ext/phar/func_interceptors.c b/ext/phar/func_interceptors.c
index 65193726d..00cb92ff1 100644
--- a/ext/phar/func_interceptors.c
+++ b/ext/phar/func_interceptors.c
@@ -733,7 +733,7 @@ notfound:
 				PHAR_G(cwd_len) = save_len;
 				efree(entry);
 				efree(arch);
-				/* Error Occured */
+				/* Error Occurred */
 				if (!IS_EXISTS_CHECK(type)) {
 					php_error_docref(NULL TSRMLS_CC, E_WARNING, "%sstat failed for %s", IS_LINK_OPERATION(type) ? "L" : "", filename);
 				}
diff --git a/ext/phar/phar.1.in b/ext/phar/phar.1.in
new file mode 100644
index 000000000..259a2bae8
--- /dev/null
+++ b/ext/phar/phar.1.in
@@ -0,0 +1,523 @@
+.TH PHAR 1 "2013" "The PHP Group" "User Commands"
+.SH NAME
+phar, phar.phar \- PHAR (PHP archive) command line tool
+.SH SYNOPSIS
+.B phar
+<command> [options] ...
+.LP
+.SH DESCRIPTION
+The \fBPHAR\fP file format provides a way to put entire PHP applications into a single
+file called a "phar" (PHP Archive) for easy distribution and installation.
+.P
+With the \fBphar\fP command you can create, update or extract PHP archives.
+.P
+Commands: 
+add compress delete extract help help-list info list meta-del
+meta-get meta-set pack sign stub-get stub-set tree version
+
+.SH add command
+Add entries to a PHAR package.
+.P
+Required arguments:
+.TP 15
+.PD
+.B -f \fIfile\fP
+Specifies the phar \fIfile\fP to work on.
+.TP
+.PD
+.B ...
+Any number of input files and directories. If -i is in
+use then ONLY files and matching the given regular
+expression are being packed. If -x is given then files
+matching that regular expression are NOT being packed.
+.P
+Optional arguments:
+.TP 15
+.PD
+.B \-a \fIalias\fP
+Provide an \fIalias\fP name for the phar file.
+.TP
+.PD
+.B \-c \fIalgo\fP
+Compression algorithm (see 
+.SM
+.B COMPRESSION
+)
+.TP
+.PD
+.B \-i \fIregex\fP
+Specifies a regular expression for input files.
+.TP
+.PD
+.B \-l \fIlevel\fP
+Number of preceding subdirectories to strip from file entries
+.TP
+.PD
+.B \-x \fIregex\fP
+Regular expression for input files to exclude.
+
+.SH compress command
+Compress or uncompress all files or a selected entry.
+.P
+Required arguments:
+.TP 15
+.PD
+.B \-c \fIalgo\fP
+Compression algorithm (see 
+.SM
+.B COMPRESSION
+)
+.TP
+.PD
+.B -f \fIfile\fP
+Specifies the phar \fIfile\fP to work on.
+.P
+Optional arguments:
+.TP 15
+.PD
+.B -e \fIentry\fP
+Name of \fIentry\fP to work on (must include PHAR internal
+directory name if any).
+
+.SH delete command
+Delete entry from a PHAR archive
+.P
+Required arguments:
+.TP 15
+.PD
+.B \-e \fIentry\fP
+Name of \fIentry\fP to work on (must include PHAR internal
+directory name if any).
+.TP
+.PD
+.B -f \fIfile\fP
+Specifies the phar \fIfile\fP to work on.
+
+.SH extract command
+Extract a PHAR package to a directory.
+.P
+Required arguments:
+.TP 15
+.PD
+.B -f \fIfile\fP
+Specifies the phar \fIfile\fP to work on.
+.P
+Optional arguments:
+.TP 15
+.PD
+.B -i \fIregex\fP
+Specifies a regular expression for input files.
+.TP
+.PD
+.B -x \fIregex\fP
+Regular expression for input files to exclude.
+.TP
+.PD
+.B ...
+Directory to extract to (defaults to '.').
+
+
+.SH help command
+This help or help for a selected command.
+.P
+Optional arguments:
+.TP 15
+.PD
+.B ...
+Optional command to retrieve help for.
+
+.SH help-list command
+Lists available commands.
+
+.SH info command
+Get information about a PHAR package.
+.P
+By using -k it is possible to return a single value.
+.P
+Required arguments:
+.TP 15
+.PD
+.B -f \fIfile\fP
+Specifies the phar \fIfile\fP to work on.
+.P
+Optional arguments:
+.TP 15
+.PD
+.B -k \fIindex\fP
+Subscription \fIindex\fP to work on.
+
+.SH list command
+List contents of a PHAR archive.
+.P
+Required arguments:
+.TP 15
+.PD
+.B -f \fIfile\fP
+Specifies the phar \fIfile\fP to work on.
+.P
+Optional arguments:
+.TP 15
+.PD
+.B -i \fIregex\fP
+Specifies a regular expression for input files.
+.TP
+.PD
+.B -x \fIregex\fP
+Regular expression for input files to exclude.
+
+
+.SH meta-del command
+Delete meta information of a PHAR entry or a PHAR package.
+.P
+If -k is given then the metadata is expected to be an array and the
+given index is being deleted.
+.P
+If something was deleted the return value is 0 otherwise it is 1.
+.P
+Required arguments:
+.TP 15
+.PD
+.B -f \fIfile\fP
+Specifies the phar \fIfile\fP to work on.
+.P
+Optional arguments:
+.TP 15
+.PD
+.B -e \fIentry\fP
+Name of \fIentry\fP to work on (must include PHAR internal
+directory name if any).
+.TP
+.PD
+.B -k \fIindex\fP
+Subscription \fIindex\fP to work on.
+
+.SH meta-get command
+Get meta information of a PHAR entry or a PHAR package in serialized from. If
+no output file is specified for meta data then stdout is being used.
+You can also specify a particular index using -k. In that case the
+metadata is expected to be an array and the value of the given index
+is returned using echo rather than using serialize. If that index does
+not exist or no meta data is present then the return value is 1.
+.P
+Required arguments:
+.TP 15
+.PD
+.B -f \fIfile\fP
+Specifies the phar \fIfile\fP to work on.
+.P
+Optional arguments:
+.TP 15
+.PD
+.B -e \fIentry\fP
+Name of \fIentry\fP to work on (must include PHAR internal
+directory name if any).
+.TP
+.PD
+.B -k \fIindex\fP
+Subscription \fIindex\fP to work on.
+
+.SH meta-set command
+Set meta data of a PHAR entry or a PHAR package using serialized input. If no
+input file is specified for meta data then stdin is being used. You can
+also specify a particular index using -k. In that case the metadata is
+expected to be an array and the value of the given index is being set.
+If the metadata is not present or empty a new array will be created.
+If the metadata is present and a flat value then the return value is
+1. Also using -k the input is been taken directly rather then being
+serialized.
+.P
+Required arguments:
+.TP 15
+.PD
+.B -f \fIfile\fP
+Specifies the phar \fIfile\fP to work on.
+.TP
+.PD
+.B -m \fImeta\fP
+Meta data to store with entry (serialized php data).
+.P
+Optional arguments:
+.TP 15
+.PD
+.B -e \fIentry\fP
+Name of \fIentry\fP to work on (must include PHAR internal
+directory name if any).
+.TP
+.PD
+.B -k \fIindex\fP
+Subscription \fIindex\fP to work on.
+
+.SH pack command
+Pack files into a PHAR archive.
+.P
+When using -s <stub>, then the stub file is being excluded from the
+list of input files/dirs.To create an archive that contains PEAR class
+PHP_Archive then point -p argument to PHP/Archive.php.
+.P
+Required arguments:
+.TP 15
+.PD
+.B -f \fIfile\fP
+Specifies the phar \fIfile\fP to work on.
+.TP
+.PD
+.B ...
+Any number of input files and directories. If -i is in
+use then ONLY files and matching the given regular
+expression are being packed. If -x is given then files
+matching that regular expression are NOT being packed.
+.P
+Optional arguments:
+.TP 15
+.PD
+.B \-a \fIalias\fP
+Provide an \fIalias\fP name for the phar file.
+.TP
+.PD
+.B \-b \fIbang\fP
+Hash-bang line to start the archive (e.g. #!/usr/bin/php).
+The hash mark itself '#!' and the newline character are optional.
+.TP
+.PD
+.B \-c \fIalgo\fP
+Compression algorithm (see 
+.SM
+.B COMPRESSION
+)
+.TP
+.PD
+.B \-h \fIhash\fP
+Selects the \fIhash\fP algorithm (see 
+.SM
+.B HASH
+)
+.TP
+.PD
+.B \-i \fIregex\fP
+Specifies a regular expression for input files.
+.TP
+.PD
+.B \-l \fIlevel\fP
+Number of preceding subdirectories to strip from file entries
+.TP
+.PD
+.B \-p \fIloader\fP
+Location of PHP_Archive class file (pear list-files
+PHP_Archive).You can use '0' or '1' to locate it
+automatically using the mentioned pear command. When
+using '0' the command does not error out when the class
+file cannot be located. This switch also adds some code
+around the stub so that class PHP_Archive gets
+registered as phar:// stream wrapper if necessary. And
+finally this switch will add the file phar.inc from
+this package and load it to ensure class Phar is
+present.
+.TP
+.PD
+.B \-s \fIstub\fP
+Select the \fIstub\fP file.
+.TP
+.PD
+.B \-x \fIregex\fP
+Regular expression for input files to exclude.
+.TP
+.PD
+.B \-y \fIkey\fP
+Private \fIkey\fP for OpenSSL signing.
+
+.SH sign command
+Set signature hash algorithm.
+.P
+Required arguments:
+.TP 15
+.PD
+.B -f \fIfile\fP
+Specifies the phar \fIfile\fP to work on.
+.TP
+.PD
+.B \-h \fIhash\fP
+Selects the \fIhash\fP algorithm (see 
+.SM
+.B HASH
+)
+.P
+Optional arguments:
+.TP 15
+.PD
+.B \-y \fIkey\fP
+Private \fIkey\fP for OpenSSL signing.
+
+.SH stub-get command
+Get the stub of a PHAR file. If no output file is specified as stub then stdout
+is being used.
+.P
+Required arguments:
+.TP 15
+.PD
+.B -f \fIfile\fP
+Specifies the phar \fIfile\fP to work on.
+.P
+Optional arguments:
+.TP 15
+.PD
+.B \-s \fIstub\fP
+Select the \fIstub\fP file.
+
+.SH stub-set command
+Set the stub of a PHAR file. If no input file is specified as stub then stdin
+is being used.
+.P
+Required arguments:
+.TP 15
+.PD
+.B -f \fIfile\fP
+Specifies the phar \fIfile\fP to work on.
+.P
+Optional arguments:
+.TP 15
+.PD
+.B \-b \fIbang\fP
+Hash-bang line to start the archive (e.g. #!/usr/bin/php).
+The hash mark itself '#!' and the newline character are optional.
+.TP
+.PD
+.B \-p \fIloader\fP
+Location of PHP_Archive class file (pear list-files
+PHP_Archive).You can use '0' or '1' to locate it
+automatically using the mentioned pear command. When
+using '0' the command does not error out when the class
+file cannot be located. This switch also adds some code
+around the stub so that class PHP_Archive gets
+registered as phar:// stream wrapper if necessary. And
+finally this switch will add the file phar.inc from
+this package and load it to ensure class Phar is
+present.
+.TP
+.PD
+.B \-s \fIstub\fP
+Select the \fIstub\fP file.
+
+
+.SH tree command
+Get a directory tree for a PHAR archive.
+.P
+Required arguments:
+.TP 15
+.PD
+.B -f \fIfile\fP
+Specifies the phar \fIfile\fP to work on.
+.P
+Optional arguments:
+.TP 15
+.PD
+.B \-i \fIregex\fP
+Specifies a regular expression for input files.
+.TP
+.PD
+.B \-x \fIregex\fP
+Regular expression for input files to exclude.
+
+.SH version command
+Get information about the PHAR environment and the tool version.
+
+
+.SH COMPRESSION
+Algorithms:
+.TP 15
+.PD
+.B 0
+No compression
+.TP
+.PD
+.B none
+No compression
+.TP
+.PD
+.B auto
+Automatically select compression algorithm
+.TP
+.PD
+.B gz
+GZip compression
+.TP
+.PD
+.B gzip
+GZip compression
+.TP
+.PD
+.B bz2
+BZip2 compression
+.TP
+.PD
+.B bzip2
+BZip2 compression
+
+.SH HASH
+Algorithms:
+.TP 15
+.PD
+.TP
+.PD
+.B md5
+MD5
+.TP
+.PD
+.B sha1
+SHA1
+.TP
+.PD
+.B sha256
+SHA256
+.TP
+.PD
+.B sha512
+SHA512
+.TP
+.PD
+.B openssl
+OpenSSL
+
+.SH SEE ALSO
+For a more or less complete description of PHAR look here:
+.PD 0
+.P
+.B http://php.net/phar
+.PD 1
+.P
+.SH BUGS
+You can view the list of known bugs or report any new bug you
+found at:
+.PD 0
+.P
+.B http://bugs.php.net
+.PD 1
+.SH AUTHORS
+The PHP Group: Thies C. Arntzen, Stig Bakken, Andi Gutmans, Rasmus Lerdorf, Sam Ruby, Sascha Schumann, Zeev Suraski, Jim Winstead, Andrei Zmievski.
+.P
+Work for the PHP archive was done by Gregory Beaver, Marcus Boerger.
+.P
+A List of active developers can be found here:
+.PD 0
+.P
+.B http://www.php.net/credits.php
+.PD 1
+.P
+And last but not least PHP was developed with the help of a huge amount of 
+contributors all around the world.
+.SH VERSION INFORMATION
+This manpage describes \fBphar\fP, version @PHP_VERSION@.
+.SH COPYRIGHT
+Copyright \(co 1997\-2013 The PHP Group
+.LP
+This source file is subject to version 3.01 of the PHP license,
+that is bundled with this package in the file LICENSE, and is
+available through the world-wide-web at the following url:
+.PD 0
+.P
+.B http://www.php.net/license/3_01.txt
+.PD 1
+.P
+If you did not receive a copy of the PHP license and are unable to
+obtain it through the world-wide-web, please send a note to
+.B license@php.net
+so we can mail you a copy immediately.
diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index c5042cc34..c85687ef5 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -2579,6 +2579,7 @@ int phar_flush(phar_archive_data *phar, char *user_stub, long len, int convert,
 	php_serialize_data_t metadata_hash;
 	smart_str main_metadata_str = {0};
 	int free_user_stub, free_fp = 1, free_ufp = 1;
+	int manifest_hack = 0;
 
 	if (phar->is_persistent) {
 		if (error) {
@@ -2930,6 +2931,12 @@ int phar_flush(phar_archive_data *phar, char *user_stub, long len, int convert,
 
 	manifest_len = offset + phar->alias_len + sizeof(manifest) + main_metadata_str.len;
 	phar_set_32(manifest, manifest_len);
+	/* Hack - see bug #65028, add padding byte to the end of the manifest */
+	if(manifest[0] == '\r' || manifest[0] == '\n') {
+		manifest_len++;
+		phar_set_32(manifest, manifest_len);
+		manifest_hack = 1;
+	}
 	phar_set_32(manifest+4, new_manifest_count);
 	if (has_dirs) {
 		*(manifest + 8) = (unsigned char) (((PHAR_API_VERSION) >> 8) & 0xFF);
@@ -3054,6 +3061,22 @@ int phar_flush(phar_archive_data *phar, char *user_stub, long len, int convert,
 			return EOF;
 		}
 	}
+	/* Hack - see bug #65028, add padding byte to the end of the manifest */
+	if(manifest_hack) {
+		if(1 != php_stream_write(newfile, manifest, 1)) {
+			if (closeoldfile) {
+				php_stream_close(oldfile);
+			}
+
+			php_stream_close(newfile);
+
+			if (error) {
+				spprintf(error, 0, "unable to write manifest padding byte");
+			}
+
+			return EOF;
+		}
+	}
 
 	/* now copy the actual file data to the new phar */
 	offset = php_stream_tell(newfile);
diff --git a/ext/phar/phar.phar.1.in b/ext/phar/phar.phar.1.in
new file mode 100644
index 000000000..b5eecbfeb
--- /dev/null
+++ b/ext/phar/phar.phar.1.in
@@ -0,0 +1 @@
+.so man1/phar.1
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index a6dd2c814..aeb11851c 100644
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -1899,6 +1899,10 @@ PHP_METHOD(Phar, buildFromDirectory)
 	pass.count = 0;
 	pass.ret = return_value;
 	pass.fp = php_stream_fopen_tmpfile();
+	if (pass.fp == NULL) {
+		zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, "phar \"%s\" unable to create temporary file", phar_obj->arc.archive->fname);
+		return;
+	}
 
 	if (phar_obj->arc.archive->is_persistent && FAILURE == phar_copy_on_write(&(phar_obj->arc.archive) TSRMLS_CC)) {
 		zval_ptr_dtor(&iteriter);
@@ -1979,6 +1983,10 @@ PHP_METHOD(Phar, buildFromIterator)
 	pass.ret = return_value;
 	pass.count = 0;
 	pass.fp = php_stream_fopen_tmpfile();
+	if (pass.fp == NULL) {
+		zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, "phar \"%s\": unable to create temporary file", phar_obj->arc.archive->fname);
+		return;
+	}
 
 	if (SUCCESS == spl_iterator_apply(obj, (spl_iterator_apply_func_t) phar_build, (void *) &pass TSRMLS_CC)) {
 		phar_obj->arc.archive->ufp = pass.fp;
@@ -2311,6 +2319,10 @@ static zval *phar_convert_to_other(phar_archive_data *source, int convert, char
 		zend_get_hash_value, NULL, 0);
 
 	phar->fp = php_stream_fopen_tmpfile();
+	if (phar->fp == NULL) {
+		zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, "unable to create temporary file");
+		return NULL;
+	}
 	phar->fname = source->fname;
 	phar->fname_len = source->fname_len;
 	phar->is_temporary_alias = source->is_temporary_alias;
diff --git a/ext/phar/tar.c b/ext/phar/tar.c
index f17033543..0e60e3db1 100644
--- a/ext/phar/tar.c
+++ b/ext/phar/tar.c
@@ -847,7 +847,10 @@ int phar_tar_setmetadata(zval *metadata, phar_entry_info *entry, char **error TS
 	entry->is_modified = 1;
 	entry->fp = php_stream_fopen_tmpfile();
 	entry->offset = entry->offset_abs = 0;
-
+	if (entry->fp == NULL) {
+		spprintf(error, 0, "phar error: unable to create temporary file");
+		return -1;
+	}
 	if (entry->metadata_str.len != php_stream_write(entry->fp, entry->metadata_str.c, entry->metadata_str.len)) {
 		spprintf(error, 0, "phar tar error: unable to write metadata to magic metadata file \"%s\"", entry->filename);
 		zend_hash_del(&(entry->phar->manifest), entry->filename, entry->filename_len);
@@ -949,7 +952,10 @@ int phar_tar_flush(phar_archive_data *phar, char *user_stub, long len, int defau
 		entry.filename = estrndup(".phar/alias.txt", sizeof(".phar/alias.txt")-1);
 		entry.filename_len = sizeof(".phar/alias.txt")-1;
 		entry.fp = php_stream_fopen_tmpfile();
-
+		if (entry.fp == NULL) {
+			spprintf(error, 0, "phar error: unable to create temporary file");
+			return -1;
+		}
 		if (phar->alias_len != (int)php_stream_write(entry.fp, phar->alias, phar->alias_len)) {
 			if (error) {
 				spprintf(error, 0, "unable to set alias in tar-based phar \"%s\"", phar->fname);
@@ -1014,6 +1020,10 @@ int phar_tar_flush(phar_archive_data *phar, char *user_stub, long len, int defau
 
 		len = pos - user_stub + 18;
 		entry.fp = php_stream_fopen_tmpfile();
+		if (entry.fp == NULL) {
+			spprintf(error, 0, "phar error: unable to create temporary file");
+			return EOF;
+		}
 		entry.uncompressed_filesize = len + 5;
 
 		if ((size_t)len != php_stream_write(entry.fp, user_stub, len)
@@ -1038,7 +1048,10 @@ int phar_tar_flush(phar_archive_data *phar, char *user_stub, long len, int defau
 	} else {
 		/* Either this is a brand new phar (add the stub), or the default stub is required (overwrite the stub) */
 		entry.fp = php_stream_fopen_tmpfile();
-
+		if (entry.fp == NULL) {
+			spprintf(error, 0, "phar error: unable to create temporary file");
+			return EOF;
+		}
 		if (sizeof(newstub)-1 != php_stream_write(entry.fp, newstub, sizeof(newstub)-1)) {
 			php_stream_close(entry.fp);
 			if (error) {
@@ -1087,7 +1100,6 @@ nostub:
 	}
 
 	newfile = php_stream_fopen_tmpfile();
-
 	if (!newfile) {
 		if (error) {
 			spprintf(error, 0, "unable to create temporary file");
@@ -1174,7 +1186,10 @@ nostub:
 		entry.filename = ".phar/signature.bin";
 		entry.filename_len = sizeof(".phar/signature.bin")-1;
 		entry.fp = php_stream_fopen_tmpfile();
-
+		if (entry.fp == NULL) {
+			spprintf(error, 0, "phar error: unable to create temporary file");
+			return EOF;
+		}
 #ifdef WORDS_BIGENDIAN
 # define PHAR_SET_32(var, buffer) \
 	*(php_uint32 *)(var) = (((((unsigned char*)&(buffer))[3]) << 24) \
diff --git a/ext/phar/tests/bug65028.phpt b/ext/phar/tests/bug65028.phpt
new file mode 100644
index 000000000..74273b850
--- /dev/null
+++ b/ext/phar/tests/bug65028.phpt
@@ -0,0 +1,156 @@
+--TEST--
+Phar - test specific manifest length
+--INI--
+phar.readonly=0
+--SKIPIF--
+<?php if (!extension_loaded("phar")) die("skip"); ?>
+--FILE--
+<?php
+
+$files = array(
+	"lib/widgets/Widgets.php",
+	"lib/events/FormBeginEventArgs.php",
+	"lib/events/FormEndEventArgs.php",
+	"lib/Core.php",
+	"lib/database/MySqlDatabase.php",
+	"lib/utils/DateUtil.php",
+	"js/global.js",
+	"files/_emptyDirectory",
+	"files/search/schema.xml",
+	"vendor/Fusonic/Linq/Internal/WhereIterator.php",
+	"vendor/Fusonic/Linq/Internal/SelectManyIterator.php",
+	"vendor/Fusonic/Linq/Internal/SelectIterator.php",
+	"vendor/Fusonic/Linq/Internal/DiffIterator.php",
+	"vendor/Fusonic/Linq/Internal/GroupIterator.php",
+	"vendor/Fusonic/Linq/Internal/DistinctIterator.php",
+	"vendor/Fusonic/Linq/Internal/LinqHelper.php",
+	"vendor/Fusonic/Linq/Internal/OrderIterator.php",
+	"vendor/Fusonic/Linq/Internal/IntersectIterator.php",
+	"vendor/Fusonic/Linq/GroupedLinq.php",
+	"vendor/Fusonic/Linq.php",
+	"vendor/Fusonic/UI/Widgets/Forms/FormBegin.php",
+	"vendor/Fusonic/UI/Widgets/Forms/FormSectionBuilder.php",
+	"vendor/Fusonic/UI/Widgets/Forms/AutoSelect.php",
+	"vendor/Fusonic/UI/Widgets/Forms/ControlGroup.php",
+	"vendor/Fusonic/UI/Widgets/Forms/FormEnd.php",
+	"vendor/Fusonic/UI/Widgets/WidgetBase.php",
+	"modules/calendar/ajax/calendarGetInvitedUsersContentAjaxHandler.php",
+	"modules/calendar/js/calendarAppointmentForm.js",
+	"modules/calendar/misc/calendarAppointment.php",
+	"modules/calendar/pages/forms/calendarAppointmentForm.php",
+	"modules/calendar/setup/config.xml",
+	"modules/cmt/js/cmtMicroCommentsWidget.js",
+	"modules/cmt/setup/config.xml",
+	"modules/meta/misc/metaContentHelper.php",
+	"modules/meta/setup/config.xml",
+	"modules/brd/misc/brdPostStreamFormatter.php",
+	"modules/brd/misc/brdPost.php",
+	"modules/brd/setup/config/streamContents.xml",
+	"modules/brd/setup/resources/lang/en.xml",
+	"modules/brd/setup/resources/lang/de.xml",
+	"modules/brd/setup/config.xml",
+	"modules/auth/misc/authLoginService.php",
+	"modules/auth/setup/config.xml",
+	"modules/bwd/cache/bwdWordCacheCreator.php",
+	"modules/bwd/bwd.php",
+	"modules/bwd/setup/config.xml",
+	"modules/nws/templates/pages/forms/nwsNewsForm.tpl",
+	"modules/nws/templates/pages/nwsShowNewsPage.tpl",
+	"modules/nws/pages/forms/nwsNewsForm.php",
+	"modules/nws/pages/nwsShowNewsPage.php",
+	"modules/nws/setup/config.xml",
+	"modules/gmp/cache/gmpMarkersCacheCreator.php",
+	"modules/gmp/select/gmpMapContentSelect.php",
+	"modules/gmp/templates/gmpShowAppointmentPage.tpl",
+	"modules/gmp/templates/gmpShowLinkPage.tpl",
+	"modules/gmp/setup/config.xml",
+	"modules/mul/cache/mulVideoPortalCacheCreator.php",
+	"modules/mul/misc/mulPermissionHelper.php",
+	"modules/mul/templates/widgets/mulFileEmbedWidget_Video_Flv.tpl",
+	"modules/mul/setup/config/mulUploadVideoPortalMatches.xml",
+	"modules/mul/setup/config.xml",
+	"modules/cat/select/catCategorySelect.php",
+	"modules/cat/misc/catCategory.php",
+	"modules/cat/templates/pages/forms/catCategoryForm.tpl",
+	"modules/cat/pages/forms/catEditCategoryForm.php",
+	"modules/cat/pages/forms/catAddCategoryForm.php",
+	"modules/cat/setup/config.xml",
+	"modules/sty/events/styPageShowEventHandler.php",
+	"modules/sty/misc/styBox.php",
+	"modules/sty/templates/pages/forms/styLayoutForm.tpl",
+	"modules/sty/templates/pages/forms/styBoxForm.tpl",
+	"modules/sty/templates/pages/forms/styVariantForm.tpl",
+	"modules/sty/setup/resources/lang/en.xml",
+	"modules/sty/setup/resources/lang/de.xml",
+	"modules/sty/setup/config.xml",
+	"modules/reg/misc/regRegistrationHelper.php",
+	"modules/reg/setup/config.xml",
+	"modules/not/misc/notEmailNotificationProvider.php",
+	"modules/not/setup/config.xml",
+	"modules/styfusonic/setup/config.xml",
+	"modules/sys/ajax/sysUserAutoSuggestSelectAjaxHandler.php",
+	"modules/sys/js/sysUserAutoSuggestSelect.js",
+	"modules/sys/select/sysPermissionSelect.php",
+	"modules/sys/misc/sysHtaccessConfigWriter.php",
+	"modules/sys/misc/sysUserRepository.php",
+	"modules/sys/setup/resources/lang/en.xml",
+	"modules/sys/setup/resources/lang/de.xml",
+	"modules/sys/setup/config.xml",
+	"modules/igr/boxes/igrGreatestEntriesBoxTab.php",
+	"modules/igr/boxes/igrTopRatedEntriesBoxTab.php",
+	"modules/igr/setup/config.xml",
+	"modules/rat/ajax/ratRateAjaxHandler.php",
+	"modules/rat/ajax/ratUnlikeAjaxHandler.php",
+	"modules/rat/setup/config.xml",
+	"modules/search/select/searchModuleSelect.php",
+	"modules/search/select/searchOrderSelect.php",
+	"modules/search/misc/searchResultFormatter.php",
+	"modules/search/misc/searchProviderSolr.php",
+	"modules/search/misc/searchProviderLucene.php",
+	"modules/search/misc/searchResultItem.php",
+	"modules/search/misc/searchProviderBase.php",
+	"modules/search/misc/searchIProvider.php",
+	"modules/search/templates/misc/searchResultFormatter.tpl",
+	"modules/search/templates/pages/searchIndexPage.tpl",
+	"modules/search/templates/pages/forms/searchSearchForm.tpl",
+	"modules/search/pages/forms/searchSearchForm.php",
+	"modules/search/css/searchResultFormatter.css",
+	"modules/search/setup/config/sysSettings.xml",
+	"modules/search/setup/resources/lang/en.xml",
+	"modules/search/setup/resources/lang/de.xml",
+	"modules/search/setup/config.xml",
+	"style/Fusonic/40components.css",
+	"style/_emptyDirectory",
+	"index.php",
+//	"a", // This will make the test pass	
+);
+
+// Create Phar with the filenames above
+$phar = new Phar(__DIR__ . "/bug65028.phar");
+foreach($files as $file)
+{
+	$phar->addFromString($file, "");
+}
+
+// Copy phar
+copy(__DIR__ . "/bug65028.phar", __DIR__ . "/bug65028-copy.phar");
+
+// Open phar
+try
+{
+	$phar = new Phar(__DIR__ . "/bug65028-copy.phar");
+	echo "No exception thrown.\n";
+}
+catch(UnexpectedValueException $ex)
+{
+	echo "Exception thrown: " . $ex->getMessage() . "\n";
+}
+?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . "/bug65028.phar");
+@unlink(__DIR__ . "/bug65028-copy.phar");
+?>
+--EXPECT--
+No exception thrown.
+
diff --git a/ext/phar/tests/files/openssl.cnf b/ext/phar/tests/files/openssl.cnf
index 10e69076c..4ed40fdc8 100644
--- a/ext/phar/tests/files/openssl.cnf
+++ b/ext/phar/tests/files/openssl.cnf
@@ -3,7 +3,7 @@ default_bits		= 1024
 default_keyfile 	= privkey.pem
 distinguished_name	= req_distinguished_name
 attributes		= req_attributes
-x509_extensions	= v3_ca	# The extentions to add to the self signed cert
+x509_extensions	= v3_ca	# The extensions to add to the self signed cert
 string_mask = MASK:4294967295
 
 
diff --git a/ext/phar/util.c b/ext/phar/util.c
index 05c90cd45..898d8bd4b 100644
--- a/ext/phar/util.c
+++ b/ext/phar/util.c
@@ -889,6 +889,10 @@ int phar_copy_entry_fp(phar_entry_info *source, phar_entry_info *dest, char **er
 	dest->offset = 0;
 	dest->is_modified = 1;
 	dest->fp = php_stream_fopen_tmpfile();
+	if (dest->fp == NULL) {
+		spprintf(error, 0, "phar error: unable to create temporary file");
+		return EOF;
+	}
 	phar_seek_efp(source, 0, SEEK_SET, 0, 1 TSRMLS_CC);
 	link = phar_get_link_source(source TSRMLS_CC);
 
@@ -1129,6 +1133,10 @@ int phar_separate_entry_fp(phar_entry_info *entry, char **error TSRMLS_DC) /* {{
 	}
 
 	fp = php_stream_fopen_tmpfile();
+	if (fp == NULL) {
+		spprintf(error, 0, "phar error: unable to create temporary file");
+		return FAILURE;
+	}
 	phar_seek_efp(entry, 0, SEEK_SET, 0, 1 TSRMLS_CC);
 	link = phar_get_link_source(entry TSRMLS_CC);
 
diff --git a/ext/phar/zip.c b/ext/phar/zip.c
index 33732fbd6..6ba745e9c 100644
--- a/ext/phar/zip.c
+++ b/ext/phar/zip.c
@@ -937,10 +937,11 @@ is_compressed:
 		PHAR_SET_32(local.uncompsize, entry->uncompressed_filesize);
 		PHAR_SET_32(central.compsize, entry->compressed_filesize);
 		PHAR_SET_32(local.compsize, entry->compressed_filesize);
-
-		if (-1 == php_stream_seek(p->old, entry->offset_abs, SEEK_SET)) {
-			spprintf(p->error, 0, "unable to seek to start of file \"%s\" while creating zip-based phar \"%s\"", entry->filename, entry->phar->fname);
-			return ZEND_HASH_APPLY_STOP;
+		if (p->old) {
+			if (-1 == php_stream_seek(p->old, entry->offset_abs, SEEK_SET)) {
+				spprintf(p->error, 0, "unable to seek to start of file \"%s\" while creating zip-based phar \"%s\"", entry->filename, entry->phar->fname);
+				return ZEND_HASH_APPLY_STOP;
+			}
 		}
 	}
 not_compressed:
@@ -1095,6 +1096,10 @@ static int phar_zip_applysignature(phar_archive_data *phar, struct _phar_zip_pas
 		off_t tell, st;
 
 		newfile = php_stream_fopen_tmpfile();
+		if (newfile == NULL) {
+			spprintf(pass->error, 0, "phar error: unable to create temporary file for the signature file");
+			return FAILURE;
+		}
 		st = tell = php_stream_tell(pass->filefp);
 		/* copy the local files, central directory, and the zip comment to generate the hash */
 		php_stream_seek(pass->filefp, 0, SEEK_SET);
@@ -1122,6 +1127,10 @@ static int phar_zip_applysignature(phar_archive_data *phar, struct _phar_zip_pas
 		entry.fp = php_stream_fopen_tmpfile();
 		entry.fp_type = PHAR_MOD;
 		entry.is_modified = 1;
+		if (entry.fp == NULL) {
+			spprintf(pass->error, 0, "phar error: unable to create temporary file for signature");
+			return FAILURE;
+		}
 
 		PHAR_SET_32(sigbuf, phar->sig_flags);
 		PHAR_SET_32(sigbuf + 4, signature_length);
@@ -1192,7 +1201,10 @@ int phar_zip_flush(phar_archive_data *phar, char *user_stub, long len, int defau
 	/* set alias */
 	if (!phar->is_temporary_alias && phar->alias_len) {
 		entry.fp = php_stream_fopen_tmpfile();
-
+		if (entry.fp == NULL) {
+			spprintf(error, 0, "phar error: unable to create temporary file");
+			return EOF;
+		}
 		if (phar->alias_len != (int)php_stream_write(entry.fp, phar->alias, phar->alias_len)) {
 			if (error) {
 				spprintf(error, 0, "unable to set alias in zip-based phar \"%s\"", phar->fname);
@@ -1267,6 +1279,10 @@ int phar_zip_flush(phar_archive_data *phar, char *user_stub, long len, int defau
 
 		len = pos - user_stub + 18;
 		entry.fp = php_stream_fopen_tmpfile();
+		if (entry.fp == NULL) {
+			spprintf(error, 0, "phar error: unable to create temporary file");
+			return EOF;
+		}
 		entry.uncompressed_filesize = len + 5;
 
 		if ((size_t)len != php_stream_write(entry.fp, user_stub, len)
@@ -1300,7 +1316,10 @@ int phar_zip_flush(phar_archive_data *phar, char *user_stub, long len, int defau
 	} else {
 		/* Either this is a brand new phar (add the stub), or the default stub is required (overwrite the stub) */
 		entry.fp = php_stream_fopen_tmpfile();
-
+		if (entry.fp == NULL) {
+			spprintf(error, 0, "phar error: unable to create temporary file");
+			return EOF;
+		}
 		if (sizeof(newstub)-1 != php_stream_write(entry.fp, newstub, sizeof(newstub)-1)) {
 			php_stream_close(entry.fp);
 			if (error) {
diff --git a/ext/posix/config.m4 b/ext/posix/config.m4
index 83ead2e46..82b80ce97 100644
--- a/ext/posix/config.m4
+++ b/ext/posix/config.m4
@@ -45,6 +45,6 @@ int main(int argc, char *argv[])
     ])
   ])
   if test "$ac_cv_have_utsname_domainname" = yes; then
-    AC_DEFINE(HAVE_UTSNAME_DOMAINNAME, 1, [Wether struct utsname has domainname])
+    AC_DEFINE(HAVE_UTSNAME_DOMAINNAME, 1, [Whether struct utsname has domainname])
   fi
 fi
diff --git a/ext/posix/tests/posix_ctermid.phpt b/ext/posix/tests/posix_ctermid.phpt
index f77da00aa..551ed7304 100644
--- a/ext/posix/tests/posix_ctermid.phpt
+++ b/ext/posix/tests/posix_ctermid.phpt
@@ -13,7 +13,7 @@ PHP Testfest Berlin 2009-05-10
     }
     // needed because of #ifdef HAVE_CTERMID in posix.c
     if (!function_exists('posix_ctermid')) { 
-        die('SKIP - Fuction posix_ctermid() not available');
+        die('SKIP - Function posix_ctermid() not available');
     }
 ?>
 --FILE--
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 3148f80db..bd460696b 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -259,6 +259,7 @@ PHP_FUNCTION(readline_info)
 #endif
 		add_assoc_string(return_value,"library_version",(char *)SAFE_STRING(rl_library_version),1);
 		add_assoc_string(return_value,"readline_name",(char *)SAFE_STRING(rl_readline_name),1);
+		add_assoc_long(return_value,"attempted_completion_over",rl_attempted_completion_over);
 	} else {
 		if (!strcasecmp(what,"line_buffer")) {
 			oldstr = rl_line_buffer;
@@ -313,7 +314,14 @@ PHP_FUNCTION(readline_info)
 				rl_readline_name = strdup(Z_STRVAL_PP(value));;
 			}
 			RETVAL_STRING(SAFE_STRING(oldstr),1);
-		} 
+		} else if (!strcasecmp(what, "attempted_completion_over")) {
+			oldval = rl_attempted_completion_over;
+			if (value) {
+				convert_to_long_ex(value);
+				rl_attempted_completion_over = Z_LVAL_PP(value);
+			}
+			RETVAL_LONG(oldval);
+		}
 	}
 }
 
diff --git a/ext/readline/tests/readline_callback_handler_install_001.phpt b/ext/readline/tests/readline_callback_handler_install_001.phpt
index 8bf1d61e4..c88a4e86f 100644
--- a/ext/readline/tests/readline_callback_handler_install_001.phpt
+++ b/ext/readline/tests/readline_callback_handler_install_001.phpt
@@ -15,7 +15,7 @@ var_dump(readline_callback_handler_install('testing: '));
 
 ?>
 --EXPECTF--
-testing: bool(true)
+%Atesting: bool(true)
 
 Warning: readline_callback_handler_install(): foobar! is not callable in %s on line %d
 bool(false)
diff --git a/ext/readline/tests/readline_callback_handler_remove_001.phpt b/ext/readline/tests/readline_callback_handler_remove_001.phpt
index 768041a4c..83b592e05 100644
--- a/ext/readline/tests/readline_callback_handler_remove_001.phpt
+++ b/ext/readline/tests/readline_callback_handler_remove_001.phpt
@@ -13,8 +13,8 @@ var_dump(readline_callback_handler_install('testing: ', 'foo'));
 var_dump(readline_callback_handler_remove());
 
 ?>
---EXPECT--
+--EXPECTF--
 bool(false)
-testing: bool(true)
+%Atesting: bool(true)
 testing: bool(true)
 bool(true)
diff --git a/ext/readline/tests/readline_info_001.phpt b/ext/readline/tests/readline_info_001.phpt
index c7bc92a4d..ebab3bf68 100644
--- a/ext/readline/tests/readline_info_001.phpt
+++ b/ext/readline/tests/readline_info_001.phpt
@@ -12,10 +12,12 @@ var_dump(readline_info('line_buffer'));
 var_dump(readline_info('readline_name'));
 var_dump(readline_info('readline_name', 1));
 var_dump(readline_info('readline_name'));
+var_dump(readline_info('attempted_completion_over',1));
+var_dump(readline_info('attempted_completion_over'));
 
 ?>
 --EXPECTF--
-array(10) {
+array(11) {
   ["line_buffer"]=>
   string(0) ""
   ["point"]=>
@@ -36,6 +38,8 @@ array(10) {
   string(%d) "%s"
   ["readline_name"]=>
   string(5) "other"
+  ["attempted_completion_over"]=>
+  int(0)
 }
 NULL
 NULL
@@ -43,3 +47,5 @@ string(0) ""
 string(5) "other"
 string(5) "other"
 string(1) "1"
+int(0)
+int(1)
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 6c4d80623..c4a7c554f 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -5237,7 +5237,7 @@ ZEND_METHOD(reflection_extension, getVersion)
 /* }}} */
 
 /* {{{ proto public ReflectionFunction[] ReflectionExtension::getFunctions()
-   Returns an array of this extension's fuctions */
+   Returns an array of this extension's functions */
 ZEND_METHOD(reflection_extension, getFunctions)
 {
 	reflection_object *intern;
diff --git a/ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt b/ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt
index 465e868cf..dfec951f7 100644
--- a/ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt
+++ b/ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-ReflectionExtension::getClassNames() method on an extension which acually returns some information
+ReflectionExtension::getClassNames() method on an extension which actually returns some information
 --CREDITS--
 Felix De Vliegher <felix.devliegher@gmail.com>
 --FILE--
diff --git a/ext/reflection/tests/bug64936.inc b/ext/reflection/tests/bug64936.inc
new file mode 100644
index 000000000..8ba8c8966
--- /dev/null
+++ b/ext/reflection/tests/bug64936.inc
@@ -0,0 +1,5 @@
+<?php
+
+class B {
+
+}
diff --git a/ext/reflection/tests/bug64936.phpt b/ext/reflection/tests/bug64936.phpt
new file mode 100644
index 000000000..363a17f50
--- /dev/null
+++ b/ext/reflection/tests/bug64936.phpt
@@ -0,0 +1,38 @@
+--TEST--
+ReflectionMethod::getDocComment() uses left over doc comment from previous scanner run
+--INI--
+opcache.save_comments=1
+opcache.load_comments=1
+--SKIPIF--
+<?php
+if (!extension_loaded('reflection') || !extension_loaded('tokenizer')) print 'skip missing reflection of tokernizer extension';
+?>
+--FILE--
+<?php
+
+function strip_doc_comment($c)
+{
+	if (!strlen($c) || $c === false) return $c;
+	return trim(substr($c, 3, -2));
+}
+
+token_get_all("<?php\n/**\n * Foo\n */"); // doc_comment compiler global now contains this Foo comment
+
+eval('class A { }'); // Could also be an include of a file containing similar
+
+$ra = new ReflectionClass('A');
+var_dump(strip_doc_comment($ra->getDocComment()));
+
+token_get_all("<?php\n/**\n * Foo\n */"); // doc_comment compiler global now contains this Foo comment
+
+include('bug64936.inc');
+
+$rb = new ReflectionClass('B');
+var_dump(strip_doc_comment($rb->getDocComment()));
+
+?>
+===DONE===
+--EXPECT--
+bool(false)
+bool(false)
+===DONE===
diff --git a/ext/session/mod_files.sh b/ext/session/mod_files.sh
index 1d2672847..4fc4f20f7 100644
--- a/ext/session/mod_files.sh
+++ b/ext/session/mod_files.sh
@@ -1,24 +1,65 @@
 #! /bin/sh
 
-if test "$2" = ""; then
-	echo "usage: $0 basedir depth"
-	exit 1
+if [[ "$2" = "" ]] || [[ "$3" = "" ]]; then
+       echo "Usage: $0 BASE_DIRECTORY DEPTH HASH_BITS"
+       echo "BASE_DIRECTORY will be created if it doesn't exist"
+       echo "DEPTH must be an integer number >0"
+       echo "HASH_BITS(session.hash_bits_per_charactor) should be one of 4, 5, or 6"
+       exit 1
 fi
 
-if test "$2" = "0"; then
-	exit 0
+if [[ "$2" = "0" ]] && [[ ! "$4" = "recurse" ]]; then
+       echo "Can't create a directory tree with depth of 0, exiting."
 fi
 
+if [[ "$2" = "0" ]]; then
+       exit 0
+fi
+
+directory="$1"
+depth="$2"
+hashbits="$3"
+
 hash_chars="0 1 2 3 4 5 6 7 8 9 a b c d e f"
-if test "$3" -a "$3" -ge "5"; then
-  hash_chars="$hash_chars g h i j k l m n o p q r s t u v"
-  if test "$3" -eq "6"; then
-    hash_chars="$hash_chars w x y z A B C D E F G H I J K L M N O P Q R S T U V W X Y Z - ,"
-  fi
+
+if [[ "$hashbits" -ge "5" ]]; then
+       hash_chars="$hash_chars g h i j k l m n o p q r s t u v"
 fi
 
+if [[ "$hashbits" -ge "6" ]]; then
+       hash_chars="$hash_chars w x y z A B C D E F G H I J K L M N O P Q R S T U V W X Y Z - ,"
+fi
+
+while [[ -d $directory ]] && [[ $( ls $directory ) ]]; do
+       echo "Directory $directory is not empty! What would you like to do?"
+
+       options="\"Delete directory contents\" \"Choose another directory\" \"Quit\""
+       eval set $options
+       select opt in "$@"; do
+
+              if [[ $opt = "Delete directory contents" ]]; then
+                     echo "Deleting $directory contents... "
+                     rm -rf $directory/*
+              elif [[ $opt = "Choose another directory" ]]; then
+                     echo "Which directory would you like to choose?"
+                     read directory
+              elif [[ $opt = "Quit" ]]; then
+                     exit 0
+              fi
+
+              break;
+       done
+done
+
+if [[ ! -d $directory ]]; then
+       mkdir -p $directory
+fi
+
+
+echo "Creating session path in $directory with a depth of $depth for session.hash_bits_per_character = $hashbits"
+
 for i in $hash_chars; do
-	newpath="$1/$i"
-	mkdir $newpath || exit 1
-	sh $0 $newpath `expr $2 - 1` $3
+       newpath="$directory/$i"
+       mkdir $newpath || exit 1
+       sh $0 $newpath `expr $depth - 1` $hashbits recurse
 done
diff --git a/ext/session/mod_mm.c b/ext/session/mod_mm.c
index e5406d0bc..e0d16d192 100644
--- a/ext/session/mod_mm.c
+++ b/ext/session/mod_mm.c
@@ -271,6 +271,8 @@ PHP_MINIT_FUNCTION(ps_mm)
 	}
 
 	if (!(euid_len = slprintf(euid, sizeof(euid), "%d", geteuid()))) {
+		free(ps_mm_instance);
+		ps_mm_instance = NULL;
 		return FAILURE;
 	}
 
diff --git a/ext/session/session.c b/ext/session/session.c
index a3be9a78c..e699cb9b5 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -281,7 +281,7 @@ PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS) /* {{{ */
 	PHP_MD5_CTX md5_context;
 	PHP_SHA1_CTX sha1_context;
 #if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH)
-	void *hash_context;
+	void *hash_context = NULL;
 #endif
 	unsigned char *digest;
 	int digest_len;
@@ -341,7 +341,7 @@ PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS) /* {{{ */
 		unsigned char rbuf[2048];
 		size_t toread = PS(entropy_length);
 
-		if (php_win32_get_random_bytes(rbuf, (size_t) toread) == SUCCESS){
+		if (php_win32_get_random_bytes(rbuf, MIN(toread, sizeof(rbuf))) == SUCCESS){
 
 			switch (PS(hash_func)) {
 				case PS_HASH_FUNC_MD5:
@@ -615,6 +615,31 @@ static PHP_INI_MH(OnUpdateSaveDir) /* {{{ */
 }
 /* }}} */
 
+static PHP_INI_MH(OnUpdateName) /* {{{ */
+{
+	/* Numeric session.name won't work at all */
+	if (PG(modules_activated) &&
+		(!new_value_length || is_numeric_string(new_value, new_value_length, NULL, NULL, 0))) {
+		int err_type;
+
+		if (stage == ZEND_INI_STAGE_RUNTIME) {
+			err_type = E_WARNING;
+		} else {
+			err_type = E_ERROR;
+		}
+
+		/* Do not output error when restoring ini options. */
+		if (stage != ZEND_INI_STAGE_DEACTIVATE) {
+			php_error_docref(NULL TSRMLS_CC, err_type, "session.name cannot be a numeric or empty '%s'", new_value);
+		}
+		return FAILURE;
+	}
+
+	OnUpdateStringUnempty(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
+	return SUCCESS;
+}
+/* }}} */
+
 static PHP_INI_MH(OnUpdateHashFunc) /* {{{ */
 {
 	long val;
@@ -706,9 +731,9 @@ static ZEND_INI_MH(OnUpdateSmartStr) /* {{{ */
  */
 PHP_INI_BEGIN()
 	STD_PHP_INI_ENTRY("session.save_path",          "",          PHP_INI_ALL, OnUpdateSaveDir,save_path,          php_ps_globals,    ps_globals)
-	STD_PHP_INI_ENTRY("session.name",               "PHPSESSID", PHP_INI_ALL, OnUpdateString, session_name,       php_ps_globals,    ps_globals)
+	STD_PHP_INI_ENTRY("session.name",               "PHPSESSID", PHP_INI_ALL, OnUpdateName, session_name,       php_ps_globals,    ps_globals)
 	PHP_INI_ENTRY("session.save_handler",           "files",     PHP_INI_ALL, OnUpdateSaveHandler)
-	STD_PHP_INI_BOOLEAN("session.auto_start",       "0",         PHP_INI_ALL, OnUpdateBool,   auto_start,         php_ps_globals,    ps_globals)
+	STD_PHP_INI_BOOLEAN("session.auto_start",       "0",         PHP_INI_PERDIR, OnUpdateBool,   auto_start,         php_ps_globals,    ps_globals)
 	STD_PHP_INI_ENTRY("session.gc_probability",     "1",         PHP_INI_ALL, OnUpdateLong,   gc_probability,     php_ps_globals,    ps_globals)
 	STD_PHP_INI_ENTRY("session.gc_divisor",         "100",       PHP_INI_ALL, OnUpdateLong,   gc_divisor,         php_ps_globals,    ps_globals)
 	STD_PHP_INI_ENTRY("session.gc_maxlifetime",     "1440",      PHP_INI_ALL, OnUpdateLong,   gc_maxlifetime,     php_ps_globals,    ps_globals)
@@ -1027,7 +1052,7 @@ static inline void strcpy_gmt(char *ubuf, time_t *when) /* {{{ */
 	res = php_gmtime_r(when, &tm);
 
 	if (!res) {
-		buf[0] = '\0';
+		ubuf[0] = '\0';
 		return;
 	}
 
@@ -2221,6 +2246,12 @@ static PHP_MSHUTDOWN_FUNCTION(session) /* {{{ */
 	PHP_MSHUTDOWN(ps_mm) (SHUTDOWN_FUNC_ARGS_PASSTHRU);
 #endif
 
+	/* reset rfc1867 callbacks */
+	php_session_rfc1867_orig_callback = NULL;
+	if (php_rfc1867_callback == php_session_rfc1867_callback) {
+		php_rfc1867_callback = NULL;
+	}
+
 	ps_serializers[PREDEFINED_SERIALIZERS].name = NULL;
 	memset(&ps_modules[PREDEFINED_MODULES], 0, (MAX_MODULES-PREDEFINED_MODULES)*sizeof(ps_module *));
 
@@ -2363,7 +2394,7 @@ static void php_session_rfc1867_update(php_session_rfc1867_progress *progress, i
 	php_session_initialize(TSRMLS_C);
 	PS(session_status) = php_session_active;
 	IF_SESSION_VARS() {
-		progress->cancel_upload = php_check_cancel_upload(progress TSRMLS_CC);
+		progress->cancel_upload |= php_check_cancel_upload(progress TSRMLS_CC);
 		ZEND_SET_SYMBOL_WITH_LENGTH(Z_ARRVAL_P(PS(http_session_vars)), progress->key.c, progress->key.len+1, progress->data, 2, 0);
 	}
 	php_session_flush(TSRMLS_C);
diff --git a/ext/session/tests/020.phpt b/ext/session/tests/020.phpt
index f43bac5d1..014112982 100644
--- a/ext/session/tests/020.phpt
+++ b/ext/session/tests/020.phpt
@@ -1,5 +1,5 @@
 --TEST--
-rewriter uses arg_seperator.output for modifying URLs
+rewriter uses arg_separator.output for modifying URLs
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
diff --git a/ext/session/tests/bug50308.phpt b/ext/session/tests/bug50308.phpt
new file mode 100644
index 000000000..110277ce3
--- /dev/null
+++ b/ext/session/tests/bug50308.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Bug #50308 (session id not appended properly for empty anchor tags)
+--SKIPIF--
+<?php include('skipif.inc'); ?>
+--INI--
+session.name=PHPSESSID
+session.save_handler=files
+session.use_trans_sid=1
+session.use_only_cookies=0
+--FILE--
+<?php
+@session_start();
+?>
+<a href=""/>
+<a href="" />
+<a href="foo"/>
+<a href="foo" />
+<a href=foo/>
+<a href=/>
+<a href=?foo=bar/>
+<a href="?foo=bar"/>
+--EXPECTF--
+<a href="?PHPSESSID=%s"/>
+<a href="?PHPSESSID=%s" />
+<a href="foo?PHPSESSID=%s"/>
+<a href="foo?PHPSESSID=%s" />
+<a href=foo/?PHPSESSID=%s>
+<a href=/?PHPSESSID=%s>
+<a href=?foo=bar/&PHPSESSID=%s>
+<a href="?foo=bar&PHPSESSID=%s"/>
diff --git a/ext/session/tests/session_name_error.phpt b/ext/session/tests/session_name_error.phpt
index 2ed10d92a..1b99d4ea3 100644
--- a/ext/session/tests/session_name_error.phpt
+++ b/ext/session/tests/session_name_error.phpt
@@ -86,7 +86,7 @@ $inputs = array(
 $iterator = 1;
 foreach($inputs as $input) {
     echo "\n-- Iteration $iterator --\n";
-    var_dump(session_name($input));
+    var_dump($input, session_name($input));
     $iterator++;
 };
 
@@ -98,77 +98,139 @@ ob_end_flush();
 *** Testing session_name() : error functionality ***
 
 -- Iteration 1 --
+
+Warning: session_name(): session.name cannot be a numeric or empty '0' in %s on line %d
+int(0)
 string(9) "PHPSESSID"
 
 -- Iteration 2 --
-string(1) "0"
+
+Warning: session_name(): session.name cannot be a numeric or empty '1' in %s on line %d
+int(1)
+string(9) "PHPSESSID"
 
 -- Iteration 3 --
-string(1) "1"
+
+Warning: session_name(): session.name cannot be a numeric or empty '12345' in %s on line %d
+int(12345)
+string(9) "PHPSESSID"
 
 -- Iteration 4 --
-string(5) "12345"
+
+Warning: session_name(): session.name cannot be a numeric or empty '-2345' in %s on line %d
+int(-2345)
+string(9) "PHPSESSID"
 
 -- Iteration 5 --
-string(5) "-2345"
+
+Warning: session_name(): session.name cannot be a numeric or empty '10.5' in %s on line %d
+float(10.5)
+string(9) "PHPSESSID"
 
 -- Iteration 6 --
-string(4) "10.5"
+
+Warning: session_name(): session.name cannot be a numeric or empty '-10.5' in %s on line %d
+float(-10.5)
+string(9) "PHPSESSID"
 
 -- Iteration 7 --
-string(5) "-10.5"
+
+Warning: session_name(): session.name cannot be a numeric or empty '123456789000' in %s on line %d
+float(123456789000)
+string(9) "PHPSESSID"
 
 -- Iteration 8 --
-string(12) "123456789000"
+
+Warning: session_name(): session.name cannot be a numeric or empty '1.23456789E-9' in %s on line %d
+float(1.23456789E-9)
+string(9) "PHPSESSID"
 
 -- Iteration 9 --
-string(13) "1.23456789E-9"
+
+Warning: session_name(): session.name cannot be a numeric or empty '0.5' in %s on line %d
+float(0.5)
+string(9) "PHPSESSID"
 
 -- Iteration 10 --
-string(3) "0.5"
+
+Warning: session_name(): session.name cannot be a numeric or empty '' in %s on line %d
+NULL
+string(9) "PHPSESSID"
 
 -- Iteration 11 --
-string(0) ""
+
+Warning: session_name(): session.name cannot be a numeric or empty '' in %s on line %d
+NULL
+string(9) "PHPSESSID"
 
 -- Iteration 12 --
-string(0) ""
+
+Warning: session_name(): session.name cannot be a numeric or empty '1' in %s on line %d
+bool(true)
+string(9) "PHPSESSID"
 
 -- Iteration 13 --
-string(1) "1"
+
+Warning: session_name(): session.name cannot be a numeric or empty '' in %s on line %d
+bool(false)
+string(9) "PHPSESSID"
 
 -- Iteration 14 --
-string(0) ""
+
+Warning: session_name(): session.name cannot be a numeric or empty '1' in %s on line %d
+bool(true)
+string(9) "PHPSESSID"
 
 -- Iteration 15 --
-string(1) "1"
+
+Warning: session_name(): session.name cannot be a numeric or empty '' in %s on line %d
+bool(false)
+string(9) "PHPSESSID"
 
 -- Iteration 16 --
+
+Warning: session_name(): session.name cannot be a numeric or empty '' in %s on line %d
 string(0) ""
+string(9) "PHPSESSID"
 
 -- Iteration 17 --
+
+Warning: session_name(): session.name cannot be a numeric or empty '' in %s on line %d
 string(0) ""
+string(9) "PHPSESSID"
 
 -- Iteration 18 --
-string(0) ""
+string(7) "Nothing"
+string(9) "PHPSESSID"
 
 -- Iteration 19 --
 string(7) "Nothing"
+string(7) "Nothing"
 
 -- Iteration 20 --
+string(12) "Hello World!"
 string(7) "Nothing"
 
 -- Iteration 21 --
+object(classA)#1 (0) {
+}
 string(12) "Hello World!"
 
 -- Iteration 22 --
+
+Warning: session_name(): session.name cannot be a numeric or empty '' in %s on line %d
+NULL
 string(12) "Hello World!"
 
 -- Iteration 23 --
-string(0) ""
+
+Warning: session_name(): session.name cannot be a numeric or empty '' in %s on line %d
+NULL
+string(12) "Hello World!"
 
 -- Iteration 24 --
 
 Warning: session_name() expects parameter 1 to be string, resource given in %s on line %d
+resource(5) of type (stream)
 NULL
-Done
-
+Done
\ No newline at end of file
diff --git a/ext/session/tests/session_name_variation1.phpt b/ext/session/tests/session_name_variation1.phpt
index 16d6ad462..b0de3ee36 100644
--- a/ext/session/tests/session_name_variation1.phpt
+++ b/ext/session/tests/session_name_variation1.phpt
@@ -43,18 +43,20 @@ ob_end_flush();
 *** Testing session_name() : variation ***
 string(9) "PHPSESSID"
 bool(true)
-string(0) ""
+string(9) "PHPSESSID"
 bool(true)
-string(0) ""
-string(0) ""
+string(9) "PHPSESSID"
+string(9) "PHPSESSID"
 bool(true)
 string(1) "	"
 bool(true)
 string(1) "	"
+
+Warning: session_name(): session.name cannot be a numeric or empty '' in %s on line %d
 string(1) "	"
 bool(true)
-string(0) ""
+string(1) "	"
 bool(true)
-string(0) ""
+string(1) "	"
 Done
 
diff --git a/ext/session/tests/session_status_disabled.phpt b/ext/session/tests/session_status_disabled.phpt
index 24e0ecd7b..c4d1f2192 100644
--- a/ext/session/tests/session_status_disabled.phpt
+++ b/ext/session/tests/session_status_disabled.phpt
@@ -3,7 +3,7 @@ Test session_status() function : disabled
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --INI--
-session.save_handler=non-existant
+session.save_handler=non-existent
 --FILE--
 <?php
 
diff --git a/ext/shmop/README b/ext/shmop/README
index 5ec15861b..a8ea03af9 100644
--- a/ext/shmop/README
+++ b/ext/shmop/README
@@ -4,12 +4,12 @@ Shared Memory Operations Extension to PHP
 
 	While developing a search deamon we needed a php based front end
 	to communicate the deamon via SHM. PHP already had a shared memory
-	extention (sysvshm) written by Christian Cartus <cartus@atrior.de>,
-	unfortunatly this extention was designed with PHP only in mind and
+	extension (sysvshm) written by Christian Cartus <cartus@atrior.de>,
+	unfortunately this extension was designed with PHP only in mind and
 	offers high level features which are extremly bothersome for basic SHM
 	we had in mind.  After spending a day trying to reverse engineer and figure
 	out the format of sysvshm we decided that it would be much easier to
-	add our own extention to php for simple SHM operations, we were right :)). 
+	add our own extension to php for simple SHM operations, we were right :)). 
 
 the functions are:
 	
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 692516840..2358f2be6 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -1070,7 +1070,7 @@ static HashTable * sxe_get_prop_hash(zval *object, int is_debug TSRMLS_DC) /* {{
 	int              namelen;
 	int              test;
 	char 		 use_iter;
-	zval            *iter_data;
+	zval            *iter_data = NULL;
 
 	use_iter = 0;
 
diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4
index ccb7eea9a..9c0b82f77 100644
--- a/ext/snmp/config.m4
+++ b/ext/snmp/config.m4
@@ -59,67 +59,6 @@ if test "$PHP_SNMP" != "no"; then
     $SNMP_SHARED_LIBADD
   ])
 
-  dnl Check for buggy snmp_snprint_value() (net-snmp BUGid 2027834)
-  AC_CACHE_CHECK([for buggy snmp_snprint_value], ac_cv_buggy_snprint_value,[
-    save_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS -I${SNMP_PREFIX}/include $SNMP_SHARED_LIBADD"
-    AC_TRY_RUN( [
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <net-snmp/net-snmp-config.h>
-#include <net-snmp/net-snmp-includes.h>
-
-u_char uname[] = "Linux nex1.php.net 2.6.18-194.32.1.el5 #1 SMP Wed Jan 5 17:53:09 EST 2011 i686";
-
-int main(int argc, char **argv)
-{
-	struct variable_list vars;
-	char buf1[2048];
-	char buf2[sizeof(buf1)];
-	
-	memset(&(buf1[0]), 0, sizeof(buf1));
-	memset(&(buf2[0]), 0, sizeof(buf2));
-	memset(&vars, 0, sizeof(vars));
-	vars.type = 4;
-	vars.val.integer = (long *)&(uname[0]);
-	vars.val.string = &(uname[0]);
-	vars.val.bitstring = &(uname[0]);
-	vars.val.counter64 = (struct counter64 *)&(uname[0]);
-	vars.val.floatVal = (float *)&(uname[0]);
-	vars.val_len = sizeof(uname),
-	vars.name_loc[0] = 1;
-	vars.name_loc[1] = 3;
-	vars.name_loc[2] = 6;
-	vars.name_loc[3] = 1;
-	vars.name_loc[4] = 2;
-	vars.name_loc[5] = 1;
-	vars.name_loc[6] = 1;
-	vars.name_loc[7] = 1;
-	vars.name = (oid *)&(vars.name_loc);
-	vars.name_length = 9;
-
-	init_snmp("snmpapp");
-
-	netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_QUICK_PRINT, 0);
-
-	snprint_value(buf1, (sizeof(uname) + 32), vars.name, vars.name_length, &vars);
-	snprint_value(buf2, sizeof(buf2), vars.name, vars.name_length, &vars);
-	exit((strncmp(buf1, buf2, sizeof(buf1)) != 0));
-}
-    ],[
-      ac_cv_buggy_snprint_value=no
-    ],[
-      ac_cv_buggy_snprint_value=yes
-    ],[
-      ac_cv_buggy_snprint_value=no
-    ])
-    CFLAGS="$save_CFLAGS"
-  ])
-  if test "$ac_cv_buggy_snprint_value" = "yes"; then
-     AC_DEFINE(BUGGY_SNMPRINT_VALUE, 1, [ ])
-  fi
-
   PHP_NEW_EXTENSION(snmp, snmp.c, $ext_shared)
   PHP_SUBST(SNMP_SHARED_LIBADD)
 fi
diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
index 0ae140f7d..93c2b21dd 100644
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -514,7 +514,7 @@ static zend_object_value php_snmp_object_new(zend_class_entry *class_type TSRMLS
 static void php_snmp_error(zval *object, const char *docref TSRMLS_DC, int type, const char *format, ...)
 {
 	va_list args;
-	php_snmp_object *snmp_object;
+	php_snmp_object *snmp_object = NULL;
 
 	if (object) {
 		snmp_object = (php_snmp_object *)zend_object_store_get_object(object TSRMLS_CC);
@@ -551,35 +551,60 @@ static void php_snmp_error(zval *object, const char *docref TSRMLS_DC, int type,
 static void php_snmp_getvalue(struct variable_list *vars, zval *snmpval TSRMLS_DC, int valueretrieval)
 {
 	zval *val;
-#ifdef BUGGY_SNMPRINT_VALUE
-	char sbuf[2048];
-#else
-	char sbuf[64];
-#endif
+	char sbuf[512];
 	char *buf = &(sbuf[0]);
 	char *dbuf = (char *)NULL;
 	int buflen = sizeof(sbuf) - 1;
 	int val_len = vars->val_len;
 	
-	if ((valueretrieval & SNMP_VALUE_PLAIN) == 0) {
-		val_len += 32; /* snprint_value will add type info into value, make some space for it */
+	/* use emalloc() for large values, use static array otherwize */
+
+	/* There is no way to know the size of buffer snprint_value() needs in order to print a value there.
+	 * So we are forced to probe it
+	 */
+	while ((valueretrieval & SNMP_VALUE_PLAIN) == 0) {
+		*buf = '\0';
+		if (snprint_value(buf, buflen, vars->name, vars->name_length, vars) == -1) {
+			if (val_len > 512*1024) {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "snprint_value() asks for a buffer more than 512k, Net-SNMP bug?");
+				break;
+			}
+			 /* buffer is not long enough to hold full output, double it */
+			val_len *= 2;
+		} else {
+			break;
+		}
+
+		if (buf == dbuf) {
+			dbuf = (char *)erealloc(dbuf, val_len + 1);
+		} else {
+			dbuf = (char *)emalloc(val_len + 1);
+		}
+
+		if (!dbuf) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "emalloc() failed: %s, fallback to static buffer", strerror(errno));
+			buf = &(sbuf[0]);
+			buflen = sizeof(sbuf) - 1;
+			break;
+		}
+
+		buf = dbuf;
+		buflen = val_len;
 	}
 
-	/* use emalloc() for large values, use static array otherwize */
-	if(val_len > buflen){
+	if((valueretrieval & SNMP_VALUE_PLAIN) && val_len > buflen){
 		if ((dbuf = (char *)emalloc(val_len + 1))) {
 			buf = dbuf;
 			buflen = val_len;
 		} else {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "emalloc() failed: %s, fallback to static array", strerror(errno));
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "emalloc() failed: %s, fallback to static buffer", strerror(errno));
 		}
 	}
 
-	*buf = 0;
-
 	MAKE_STD_ZVAL(val);
 
 	if (valueretrieval & SNMP_VALUE_PLAIN) {
+		*buf = 0;
 		switch (vars->type) {
 		case ASN_BIT_STR:		/* 0x03, asn1.h */
 			ZVAL_STRINGL(val, (char *)vars->val.bitstring, vars->val_len, 1);
@@ -652,7 +677,7 @@ static void php_snmp_getvalue(struct variable_list *vars, zval *snmpval TSRMLS_D
 			break;
 		}
 	} else /* use Net-SNMP value translation */ {
-		snprint_value(buf, buflen, vars->name, vars->name_length, vars);
+		/* we have desired string in buffer, just use it */
 		ZVAL_STRING(val, buf, 1);
 	}
 
@@ -694,7 +719,7 @@ static void php_snmp_internal(INTERNAL_FUNCTION_PARAMETERS, int st,
 	zval *snmpval = NULL;
 	int snmp_errno;
 
-	/* we start with retval=FALSE. If any actual data is aquired, retval will be set to appropriate type */
+	/* we start with retval=FALSE. If any actual data is acquired, retval will be set to appropriate type */
 	RETVAL_FALSE;
 	
 	/* reset errno and errstr */
@@ -1162,9 +1187,10 @@ static int netsnmp_session_init(php_snmp_session **session_p, int version, char
 			continue;
 		}
 		if ((*res)->sa_family == AF_INET6) {
-			strcpy(session->peername, "udp6:");
+			strcpy(session->peername, "udp6:[");
 			pptr = session->peername + strlen(session->peername);
 			inet_ntop((*res)->sa_family, &(((struct sockaddr_in6*)(*res))->sin6_addr), pptr, MAX_NAME_LEN);
+			strcat(pptr, "]");
 		} else if ((*res)->sa_family == AF_INET) {
 			inet_ntop((*res)->sa_family, &(((struct sockaddr_in*)(*res))->sin_addr), pptr, MAX_NAME_LEN);
 		} else {
@@ -1845,7 +1871,7 @@ PHP_METHOD(snmp, close)
 /* }}} */
 
 /* {{{ proto mixed SNMP::get(mixed object_id [, bool preserve_keys])
-   Fetch a SNMP object returing scalar for single OID and array of oid->value pairs for multi OID request */
+   Fetch a SNMP object returning scalar for single OID and array of oid->value pairs for multi OID request */
 PHP_METHOD(snmp, get)
 {
 	php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GET, (-1));
@@ -1853,7 +1879,7 @@ PHP_METHOD(snmp, get)
 /* }}} */
 
 /* {{{ proto mixed SNMP::getnext(mixed object_id)
-   Fetch a SNMP object returing scalar for single OID and array of oid->value pairs for multi OID request */
+   Fetch a SNMP object returning scalar for single OID and array of oid->value pairs for multi OID request */
 PHP_METHOD(snmp, getnext)
 {
 	php_snmp(INTERNAL_FUNCTION_PARAM_PASSTHRU, SNMP_CMD_GETNEXT, (-1));
diff --git a/ext/snmp/tests/README b/ext/snmp/tests/README
index 819a50d8a..0db1a4f82 100644
--- a/ext/snmp/tests/README
+++ b/ext/snmp/tests/README
@@ -35,6 +35,8 @@ On Linux/FreeBSD
 Before launching daemon make sure that there is no file /var/net-snmp/snmpd.conf
 Delete it if exists. Ingoring to to so will fail SNMPv3 tests.
 
+- Place bigtest.sh near snmpd.conf, tune path to it in snmpd.conf
+
 - Launch snmpd (service snmpd start or /etc/init.d/snmpd start).
   Alternatively you can start snmpd daemon using following command line:
     sudo snmpd -C -c ./snmpd.conf -f -Le
diff --git a/ext/snmp/tests/bigtest.sh b/ext/snmp/tests/bigtest.sh
new file mode 100755
index 000000000..d0d8be783
--- /dev/null
+++ b/ext/snmp/tests/bigtest.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+Q="";
+i=0;
+while [ $i -lt 32 ]; do
+	Q="${Q}\3\2\4\11\22\13\14\15\16\17\20\21\22\23\24\25\26\27";
+	i=$((i+1));
+done
+
+printf "${Q}"
diff --git a/ext/snmp/tests/bug64159.phpt b/ext/snmp/tests/bug64159.phpt
new file mode 100644
index 000000000..52e53c957
--- /dev/null
+++ b/ext/snmp/tests/bug64159.phpt
@@ -0,0 +1,24 @@
+--TEST--                                 
+Bug #64159: Truncated snmpget
+--CREDITS--
+Boris Lytochkin
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__).'/skipif.inc');
+?>
+--ENV--
+MIBS=noneXistent
+--FILE--
+<?php
+require_once(dirname(__FILE__).'/snmp_include.inc');
+
+snmp_set_quick_print(false);
+snmp_set_valueretrieval(SNMP_VALUE_LIBRARY);
+
+var_dump(("ab8283f948419b2d24d22f44a80b17d3" === md5(snmpget($hostname, $community, '.1.3.6.1.4.1.2021.8.1.101.1'))));
+
+?>
+--EXPECTF--
+MIB search path: %s
+Cannot find module (noneXistent): At line %d in (%s)
+bool(true)
diff --git a/ext/snmp/tests/snmp-object.phpt b/ext/snmp/tests/snmp-object.phpt
index 522d417af..40567dae9 100644
--- a/ext/snmp/tests/snmp-object.phpt
+++ b/ext/snmp/tests/snmp-object.phpt
@@ -90,12 +90,6 @@ array_shift($z);
 var_dump(key($z));
 array_shift($z);
 var_dump(key($z));
-array_shift($z);
-var_dump(key($z));
-array_shift($z);
-var_dump(key($z));
-array_shift($z);
-var_dump(key($z));
 var_dump($session->close());
 
 echo "SNMPv3 (default security settings)\n";
@@ -211,9 +205,6 @@ string(3) "2.0"
 string(3) "3.0"
 string(3) "4.0"
 string(3) "5.0"
-string(3) "6.0"
-string(3) "7.0"
-string(3) "8.0"
 bool(true)
 SNMPv3 (default security settings)
 string(%d) "%S"
diff --git a/ext/snmp/tests/snmpd.conf b/ext/snmp/tests/snmpd.conf
index 3e9137294..5297d0b9e 100644
--- a/ext/snmp/tests/snmpd.conf
+++ b/ext/snmp/tests/snmpd.conf
@@ -23,3 +23,5 @@ createUser adminMD5DES MD5 test1234 DES test1234
 
 createUser noAuthUser
 authuser read noAuthUser noauth
+
+exec HexTest /bin/sh /etc/snmp/bigtest.sh
diff --git a/ext/soap/TODO b/ext/soap/TODO
index ad0b11c94..9e6784f6f 100644
--- a/ext/soap/TODO
+++ b/ext/soap/TODO
@@ -41,7 +41,7 @@ Encoding
 ? support for "nillable" and "nil"
 ? default values of <element>
 ? provide schema 1999/2001 support???
-? make internal refrences for soap encoding (use seralization logic)???
+? make internal references for soap encoding (use serialization logic)???
 ? provide user space overriding of serialization certin objects and types???
 
 WSDL
diff --git a/ext/soap/TODO.old b/ext/soap/TODO.old
index 59deb4b9d..b219c61f8 100644
--- a/ext/soap/TODO.old
+++ b/ext/soap/TODO.old
@@ -2,13 +2,13 @@ TODO:
 make sure soap 1.1 and 1.2 is supported fully
 Better WSDL support Client and server (how much validation is needed here?)
 UDDI??
-make internal refrences for soap encoding (use seralization logic)
+make internal references for soap encoding (use serialization logic)
 add ini option for always soap_error_handler
 provide user space overriding of serialization certin objects and types
 serialization in general needs to be polished/finished... all xsd types
 look to see if php-soap will work with out always_populate_raw_post_data on
 see if client will work with ssl.. should be eaiser with php_streams
-work on soap seralizer (php serialization)
+work on soap serializer (php serialization)
 -work on a soap-service 'regiestry' and 'proxy' (apache soap style)
 -convert all string mainpulation to use smart_str
 make the 'soap' packet abstract.. maybe incorperate xml-rpc
diff --git a/ext/soap/interop/client_round2_interop.php b/ext/soap/interop/client_round2_interop.php
index 5b978734e..b8ee893d8 100644
--- a/ext/soap/interop/client_round2_interop.php
+++ b/ext/soap/interop/client_round2_interop.php
@@ -300,7 +300,7 @@ class Interop_Client
 
     /**
     *  decodeSoapval
-    * decodes a soap value to php type, used for test result comparisions
+    * decodes a soap value to php type, used for test result comparisons
     *
     * @param SOAP_Value soapval
     * @return mixed result
@@ -398,7 +398,7 @@ class Interop_Client
             $namespace = $soapaction = 'http://soapinterop.org/';
             // hack to make tests work with MS SoapToolkit
             // it's the only one that uses this soapaction, and breaks if
-            // it isn't right.  Can't wait for soapaction to be fully depricated
+            // it isn't right.  Can't wait for soapaction to be fully deprecated
             if ($this->currentTest == 'base' &&
                 strstr($endpoint_info['endpointName'],'MS SOAP ToolKit 2.0')) {
                 $soapaction = 'urn:soapinterop';
diff --git a/ext/soap/interop/client_round2_params.php b/ext/soap/interop/client_round2_params.php
index f0987a170..e0b2c0e82 100644
--- a/ext/soap/interop/client_round2_params.php
+++ b/ext/soap/interop/client_round2_params.php
@@ -486,7 +486,7 @@ $test->headers_expect = array();
 $soap_tests['GroupC'][] = $test;
 
 // echoMeStringRequest with endpoint header destination, must understand,
-// invalid namespace, should recieve a fault
+// invalid namespace, should receive a fault
 $test = new SOAP_Test('echoVoid(echoMeStringRequest invalid namespace)', NULL);
 $test->headers[] = new SoapHeader('http://unknown.org/echoheader/','echoMeStringRequest', 'hello world', 1, SOAP_ACTOR_NEXT);
 $test->headers_expect = array();
diff --git a/ext/soap/interop/index.php b/ext/soap/interop/index.php
index 1ae25d92f..fc12bc8cb 100644
--- a/ext/soap/interop/index.php
+++ b/ext/soap/interop/index.php
@@ -35,7 +35,7 @@ classes to define what the type of the value is.</p>
 
 <h3>Client Test Interface</h3>
 <p>The <a href="client_round2.php">client interface</a> allows you to run the PHP SOAP
-Client against a choosen interop server.  Each run updates the results database below.</p>
+Client against a chosen interop server.  Each run updates the results database below.</p>
 
 <h3>Interop Client Test Results</h3>
 <p>This is a database of the current test results using PHP SOAP Clients against interop servers.</p>
diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c
index d83b85e63..7fc755d51 100644
--- a/ext/soap/php_http.c
+++ b/ext/soap/php_http.c
@@ -1160,7 +1160,7 @@ try_again:
 				zval *err;
 				MAKE_STD_ZVAL(err);
 				ZVAL_STRINGL(err, http_body, http_body_size, 1);
-				add_soap_fault(this_ptr, "HTTP", "Didn't recieve an xml document", NULL, err TSRMLS_CC);
+				add_soap_fault(this_ptr, "HTTP", "Didn't receive an xml document", NULL, err TSRMLS_CC);
 				efree(content_type);
 				efree(http_headers);
 				efree(http_body);
diff --git a/ext/soap/php_schema.c b/ext/soap/php_schema.c
index 7d2e12974..25bb17727 100644
--- a/ext/soap/php_schema.c
+++ b/ext/soap/php_schema.c
@@ -1081,6 +1081,14 @@ static int schema_group(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr groupType, sdlTyp
 			nsptr = xmlSearchNs(groupType->doc, groupType, BAD_CAST(ns));
 			if (nsptr != NULL) {
 				smart_str_appends(&key, (char*)nsptr->href);
+			} else {
+				xmlAttrPtr ns = get_attribute(groupType->properties, "targetNamespace");
+				if (ns == NULL) {
+					ns = tns;
+				}
+				if (ns) {
+					smart_str_appends(&key, (char*)ns->children->content);
+				}
 			}
 			smart_str_appendc(&key, ':');
 			smart_str_appends(&key, type);
@@ -1509,6 +1517,14 @@ static int schema_element(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr element, sdlTyp
 			if (nsptr != NULL) {
 				smart_str_appends(&nscat, (char*)nsptr->href);
 				newType->namens = estrdup((char*)nsptr->href);
+			} else {
+				xmlAttrPtr ns = get_attribute(attrs, "targetNamespace");
+				if (ns == NULL) {
+					ns = tns;
+				}
+				if (ns) {
+					smart_str_appends(&nscat, (char*)ns->children->content);
+				}
 			} 
 			smart_str_appendc(&nscat, ':');
 			smart_str_appends(&nscat, type);
@@ -1735,6 +1751,14 @@ static int schema_attribute(sdlPtr sdl, xmlAttrPtr tns, xmlNodePtr attrType, sdl
 			if (nsptr != NULL) {
 				smart_str_appends(&key, (char*)nsptr->href);
 				newAttr->namens = estrdup((char*)nsptr->href);
+			} else {
+				xmlAttrPtr ns = get_attribute(attrType->properties, "targetNamespace");
+				if (ns == NULL) {
+					ns = tns;
+				}
+				if (ns) {
+					smart_str_appends(&key, (char*)ns->children->content);
+				}
 			}
 			smart_str_appendc(&key, ':');
 			smart_str_appends(&key, attr_name);
@@ -2036,13 +2060,31 @@ static void copy_extra_attribute(void *attribute)
 	}
 }
 
+static void* schema_find_by_ref(HashTable *ht, char *ref)
+{
+	void **tmp;
+
+	if (zend_hash_find(ht, ref, strlen(ref)+1, (void**)&tmp) == SUCCESS) {
+		return tmp;
+	} else {
+		ref = strrchr(ref, ':');
+		if (ref) {
+			if (zend_hash_find(ht, ref, strlen(ref)+1, (void**)&tmp) == SUCCESS) {
+				return tmp;
+			}
+		}
+	}
+	return NULL;
+}
+
 static void schema_attribute_fixup(sdlCtx *ctx, sdlAttributePtr attr)
 {
 	sdlAttributePtr *tmp;
 
 	if (attr->ref != NULL) {
 		if (ctx->attributes != NULL) {
-			if (zend_hash_find(ctx->attributes, attr->ref, strlen(attr->ref)+1, (void**)&tmp) == SUCCESS) {
+			tmp = (sdlAttributePtr*)schema_find_by_ref(ctx->attributes, attr->ref);
+			if (tmp) {
 				schema_attribute_fixup(ctx, *tmp);
 				if ((*tmp)->name != NULL && attr->name == NULL) {
 					attr->name = estrdup((*tmp)->name);
@@ -2092,7 +2134,8 @@ static void schema_attributegroup_fixup(sdlCtx *ctx, sdlAttributePtr attr, HashT
 
 	if (attr->ref != NULL) {
 		if (ctx->attributeGroups != NULL) {
-			if (zend_hash_find(ctx->attributeGroups, attr->ref, strlen(attr->ref)+1, (void**)&tmp) == SUCCESS) {
+			tmp = (sdlTypePtr*)schema_find_by_ref(ctx->attributeGroups, attr->ref);
+			if (tmp) {
 				if ((*tmp)->attributes) {
 					zend_hash_internal_pointer_reset((*tmp)->attributes);
 					while (zend_hash_get_current_data((*tmp)->attributes,(void**)&tmp_attr) == SUCCESS) {
@@ -2149,7 +2192,7 @@ static void schema_content_model_fixup(sdlCtx *ctx, sdlContentModelPtr model)
 				model->kind = XSD_CONTENT_GROUP;
 				model->u.group = (*tmp);
 			} else {
-				soap_error0(E_ERROR, "Parsing Schema: unresolved group 'ref' attribute");
+				soap_error1(E_ERROR, "Parsing Schema: unresolved group 'ref' attribute '%s'", model->u.group_ref);
 			}
 			break;
 		}
@@ -2193,7 +2236,8 @@ static void schema_type_fixup(sdlCtx *ctx, sdlTypePtr type)
 
 	if (type->ref != NULL) {
 		if (ctx->sdl->elements != NULL) {
-			if (zend_hash_find(ctx->sdl->elements, type->ref, strlen(type->ref)+1, (void**)&tmp) == SUCCESS) {
+			tmp = (sdlTypePtr*)schema_find_by_ref(ctx->sdl->elements, type->ref);
+			if (tmp) {
 				type->kind = (*tmp)->kind;
 				type->encode = (*tmp)->encode;
 				if ((*tmp)->nillable) {
@@ -2209,7 +2253,7 @@ static void schema_type_fixup(sdlCtx *ctx, sdlTypePtr type)
 			} else if (strcmp(type->ref, SCHEMA_NAMESPACE ":schema") == 0) {
 				type->encode = get_conversion(XSD_ANYXML);
 			} else {
-				soap_error0(E_ERROR, "Parsing Schema: unresolved element 'ref' attribute");
+				soap_error1(E_ERROR, "Parsing Schema: unresolved element 'ref' attribute '%s'", type->ref);
 			}
 		}
 		efree(type->ref);
diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c
index 33e137cbb..0ac4c2ed7 100644
--- a/ext/soap/php_sdl.c
+++ b/ext/soap/php_sdl.c
@@ -40,8 +40,8 @@ static void delete_binding(void *binding);
 static void delete_binding_persistent(void *binding);
 static void delete_function(void *function);
 static void delete_function_persistent(void *function);
-static void delete_parameter(void *paramater);
-static void delete_parameter_persistent(void *paramater);
+static void delete_parameter(void *parameter);
+static void delete_parameter_persistent(void *parameter);
 static void delete_header(void *header);
 static void delete_header_persistent(void *header);
 static void delete_document(void *doc_ptr);
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 7df84e5b2..9371df6fb 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -1284,7 +1284,7 @@ PHP_METHOD(SoapServer, setClass)
 			}
 		}
 	} else {
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to set a non existant class (%s)", classname);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to set a non existent class (%s)", classname);
 		return;
 	}
 
@@ -1415,7 +1415,7 @@ PHP_METHOD(SoapServer, addFunction)
 				zend_str_tolower_copy(key, Z_STRVAL_PP(tmp_function), key_len);
 
 				if (zend_hash_find(EG(function_table), key, key_len+1, (void**)&f) == FAILURE) {
-					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to add a non existant function '%s'", Z_STRVAL_PP(tmp_function));
+					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to add a non existent function '%s'", Z_STRVAL_PP(tmp_function));
 					return;
 				}
 
@@ -1437,7 +1437,7 @@ PHP_METHOD(SoapServer, addFunction)
 		zend_str_tolower_copy(key, Z_STRVAL_P(function_name), key_len);
 
 		if (zend_hash_find(EG(function_table), key, key_len+1, (void**)&f) == FAILURE) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to add a non existant function '%s'", Z_STRVAL_P(function_name));
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Tried to add a non existent function '%s'", Z_STRVAL_P(function_name));
 			return;
 		}
 		if (service->soap_functions.ft == NULL) {
@@ -1669,7 +1669,7 @@ PHP_METHOD(SoapServer, handle)
 			}
 		}
 #endif
-		/* If new session or something wierd happned */
+		/* If new session or something weird happned */
 		if (soap_obj == NULL) {
 			zval *tmp_soap;
 
@@ -3658,7 +3658,44 @@ ignore_header:
 	return function;
 }
 
-static int serialize_response_call2(xmlNodePtr body, sdlFunctionPtr function, char *function_name, char *uri, zval *ret, int version, int main TSRMLS_DC)
+static void set_soap_header_attributes(xmlNodePtr h, HashTable *ht, int version)
+{
+	zval **tmp;
+
+	if (zend_hash_find(ht, "mustUnderstand", sizeof("mustUnderstand"), (void**)&tmp) == SUCCESS &&
+	    Z_TYPE_PP(tmp) == IS_BOOL && Z_LVAL_PP(tmp)) {
+		if (version == SOAP_1_1) {
+			xmlSetProp(h, BAD_CAST(SOAP_1_1_ENV_NS_PREFIX":mustUnderstand"), BAD_CAST("1"));
+		} else {
+			xmlSetProp(h, BAD_CAST(SOAP_1_2_ENV_NS_PREFIX":mustUnderstand"), BAD_CAST("true"));
+		}
+	}
+	if (zend_hash_find(ht, "actor", sizeof("actor"), (void**)&tmp) == SUCCESS) {
+		if (Z_TYPE_PP(tmp) == IS_STRING) {
+			if (version == SOAP_1_1) {
+				xmlSetProp(h, BAD_CAST(SOAP_1_1_ENV_NS_PREFIX":actor"), BAD_CAST(Z_STRVAL_PP(tmp)));
+			} else {
+				xmlSetProp(h, BAD_CAST(SOAP_1_2_ENV_NS_PREFIX":role"), BAD_CAST(Z_STRVAL_PP(tmp)));
+			}
+		} else if (Z_TYPE_PP(tmp) == IS_LONG) {
+			if (version == SOAP_1_1) {
+				if (Z_LVAL_PP(tmp) == SOAP_ACTOR_NEXT) {
+					xmlSetProp(h, BAD_CAST(SOAP_1_1_ENV_NS_PREFIX":actor"), BAD_CAST(SOAP_1_1_ACTOR_NEXT));
+				}
+			} else {
+				if (Z_LVAL_PP(tmp) == SOAP_ACTOR_NEXT) {
+					xmlSetProp(h, BAD_CAST(SOAP_1_2_ENV_NS_PREFIX":role"), BAD_CAST(SOAP_1_2_ACTOR_NEXT));
+				} else if (Z_LVAL_PP(tmp) == SOAP_ACTOR_NONE) {
+					xmlSetProp(h, BAD_CAST(SOAP_1_2_ENV_NS_PREFIX":role"), BAD_CAST(SOAP_1_2_ACTOR_NONE));
+				} else if (Z_LVAL_PP(tmp) == SOAP_ACTOR_UNLIMATERECEIVER) {
+					xmlSetProp(h, BAD_CAST(SOAP_1_2_ENV_NS_PREFIX":role"), BAD_CAST(SOAP_1_2_ACTOR_UNLIMATERECEIVER));
+				}
+			}
+		}
+	}
+}
+
+static int serialize_response_call2(xmlNodePtr body, sdlFunctionPtr function, char *function_name, char *uri, zval *ret, int version, int main, xmlNodePtr *node TSRMLS_DC)
 {
 	xmlNodePtr method = NULL, param;
 	sdlParamPtr parameter = NULL;
@@ -3758,6 +3795,9 @@ static int serialize_response_call2(xmlNodePtr body, sdlFunctionPtr function, ch
 	if (use == SOAP_ENCODED && version == SOAP_1_2 && method != NULL) {
 		xmlSetNsProp(method, body->ns, BAD_CAST("encodingStyle"), BAD_CAST(SOAP_1_2_ENC_NAMESPACE));
 	}
+	if (node) {
+		*node = method;
+	}
 	return use;
 }
 
@@ -3839,7 +3879,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function
 			}
 
 			if (headers->function) {
-				if (serialize_response_call2(head, headers->function, Z_STRVAL(headers->function_name), uri, hdr_ret, version, 0 TSRMLS_CC) == SOAP_ENCODED) {
+				if (serialize_response_call2(head, headers->function, Z_STRVAL(headers->function_name), uri, hdr_ret, version, 0, NULL TSRMLS_CC) == SOAP_ENCODED) {
 					use = SOAP_ENCODED;
 				}
 			} else {
@@ -3909,7 +3949,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function
 
 		if (version == SOAP_1_1) {
 			if (zend_hash_find(prop, "faultcode", sizeof("faultcode"), (void**)&tmp) == SUCCESS) {
-				int new_len;
+				size_t new_len;
 				xmlNodePtr node = xmlNewNode(NULL, BAD_CAST("faultcode"));
 				char *str = php_escape_html_entities((unsigned char*)Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), &new_len, 0, 0, NULL TSRMLS_CC);
 				xmlAddChild(param, node);
@@ -3919,7 +3959,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function
 					xmlNodeSetContent(node, code);
 					xmlFree(code);
 				} else {	
-					xmlNodeSetContentLen(node, BAD_CAST(str), new_len);
+					xmlNodeSetContentLen(node, BAD_CAST(str), (int)new_len);
 				}
 				efree(str);
 			}
@@ -3934,7 +3974,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function
 			detail_name = "detail";
 		} else {
 			if (zend_hash_find(prop, "faultcode", sizeof("faultcode"), (void**)&tmp) == SUCCESS) {
-				int new_len;
+				size_t new_len;
 				xmlNodePtr node = xmlNewChild(param, ns, BAD_CAST("Code"), NULL);
 				char *str = php_escape_html_entities((unsigned char*)Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), &new_len, 0, 0, NULL TSRMLS_CC);
 				node = xmlNewChild(node, ns, BAD_CAST("Value"), NULL);
@@ -3944,7 +3984,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function
 					xmlNodeSetContent(node, code);
 					xmlFree(code);
 				} else {	
-					xmlNodeSetContentLen(node, BAD_CAST(str), new_len);
+					xmlNodeSetContentLen(node, BAD_CAST(str), (int)new_len);
 				}
 				efree(str);
 			}
@@ -4025,15 +4065,15 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function
 					zval *hdr_ret = &h->retval;
 					char *hdr_ns   = h->hdr?h->hdr->ns:NULL;
 					char *hdr_name = Z_STRVAL(h->function_name);
-
+					HashTable *ht = NULL;
 
 					if (Z_TYPE(h->retval) == IS_OBJECT &&
 					    instanceof_function(Z_OBJCE(h->retval), soap_header_class_entry TSRMLS_CC)) {
-						HashTable* ht = Z_OBJPROP(h->retval);
 						zval **tmp;
 						sdlSoapBindingFunctionHeaderPtr *hdr;
 						smart_str key = {0};
 
+						ht = Z_OBJPROP(h->retval);
 						if (zend_hash_find(ht, "namespace", sizeof("namespace"), (void**)&tmp) == SUCCESS &&
 					      Z_TYPE_PP(tmp) == IS_STRING) {
 							smart_str_appendl(&key, Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
@@ -4064,9 +4104,14 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function
 					}
 
 					if (h->function) {
-						if (serialize_response_call2(head, h->function, Z_STRVAL(h->function_name), uri, hdr_ret, version, 0 TSRMLS_CC) == SOAP_ENCODED) {
+						xmlNodePtr xmlHdr = NULL;
+
+						if (serialize_response_call2(head, h->function, Z_STRVAL(h->function_name), uri, hdr_ret, version, 0, &xmlHdr TSRMLS_CC) == SOAP_ENCODED) {
 							use = SOAP_ENCODED;
 						}
+						if (ht) {
+							set_soap_header_attributes(xmlHdr, ht, version);
+						}
 					} else {
 						xmlNodePtr xmlHdr = master_to_xml(hdr_enc, hdr_ret, hdr_use, head TSRMLS_CC);
 						if (hdr_name) {
@@ -4076,6 +4121,9 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function
 							xmlNsPtr nsptr = encode_add_ns(xmlHdr,hdr_ns);
 							xmlSetNs(xmlHdr, nsptr);
 						}
+						if (ht) {
+							set_soap_header_attributes(xmlHdr, ht, version);
+						}
 					}
 				}
 				h = h->next;
@@ -4089,7 +4137,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function
 
 		body = xmlNewChild(envelope, ns, BAD_CAST("Body"), NULL);
 
-		if (serialize_response_call2(body, function, function_name, uri, ret, version, 1 TSRMLS_CC) == SOAP_ENCODED) {
+		if (serialize_response_call2(body, function, function_name, uri, ret, version, 1, NULL TSRMLS_CC) == SOAP_ENCODED) {
 			use = SOAP_ENCODED;
 		}
 
@@ -4281,38 +4329,7 @@ static xmlDocPtr serialize_function_call(zval *this_ptr, sdlFunctionPtr function
 				}
 				nsptr = encode_add_ns(h, Z_STRVAL_PP(ns));
 				xmlSetNs(h, nsptr);
-
-				if (zend_hash_find(ht, "mustUnderstand", sizeof("mustUnderstand"), (void**)&tmp) == SUCCESS &&
-				    Z_TYPE_PP(tmp) == IS_BOOL && Z_LVAL_PP(tmp)) {
-					if (version == SOAP_1_1) {
-						xmlSetProp(h, BAD_CAST(SOAP_1_1_ENV_NS_PREFIX":mustUnderstand"), BAD_CAST("1"));
-					} else {
-						xmlSetProp(h, BAD_CAST(SOAP_1_2_ENV_NS_PREFIX":mustUnderstand"), BAD_CAST("true"));
-					}
-				}
-				if (zend_hash_find(ht, "actor", sizeof("actor"), (void**)&tmp) == SUCCESS) {
-					if (Z_TYPE_PP(tmp) == IS_STRING) {
-						if (version == SOAP_1_1) {
-							xmlSetProp(h, BAD_CAST(SOAP_1_1_ENV_NS_PREFIX":actor"), BAD_CAST(Z_STRVAL_PP(tmp)));
-						} else {
-							xmlSetProp(h, BAD_CAST(SOAP_1_2_ENV_NS_PREFIX":role"), BAD_CAST(Z_STRVAL_PP(tmp)));
-						}
-					} else if (Z_TYPE_PP(tmp) == IS_LONG) {
-						if (version == SOAP_1_1) {
-							if (Z_LVAL_PP(tmp) == SOAP_ACTOR_NEXT) {
-								xmlSetProp(h, BAD_CAST(SOAP_1_1_ENV_NS_PREFIX":actor"), BAD_CAST(SOAP_1_1_ACTOR_NEXT));
-							}
-						} else {
-							if (Z_LVAL_PP(tmp) == SOAP_ACTOR_NEXT) {
-								xmlSetProp(h, BAD_CAST(SOAP_1_2_ENV_NS_PREFIX":role"), BAD_CAST(SOAP_1_2_ACTOR_NEXT));
-							} else if (Z_LVAL_PP(tmp) == SOAP_ACTOR_NONE) {
-								xmlSetProp(h, BAD_CAST(SOAP_1_2_ENV_NS_PREFIX":role"), BAD_CAST(SOAP_1_2_ACTOR_NONE));
-							} else if (Z_LVAL_PP(tmp) == SOAP_ACTOR_UNLIMATERECEIVER) {
-								xmlSetProp(h, BAD_CAST(SOAP_1_2_ENV_NS_PREFIX":role"), BAD_CAST(SOAP_1_2_ACTOR_UNLIMATERECEIVER));
-							}
-						}
-					}
-				}
+				set_soap_header_attributes(h, ht, version);
 			}
 			zend_hash_move_forward(soap_headers);
 		}
diff --git a/ext/soap/tests/bugs/bug27742.wsdl b/ext/soap/tests/bugs/bug27742.wsdl
index f38d91185..7f1514acb 100644
--- a/ext/soap/tests/bugs/bug27742.wsdl
+++ b/ext/soap/tests/bugs/bug27742.wsdl
@@ -5,7 +5,7 @@
 		<xsd:schema targetNamespace="urn:TMSWebServices" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tms="urn:TMSWebServices" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

 	<simpleType name="duration">

 		<annotation>

-			<documentation xml:lang="en">ISO 8601 pattern used to denote program durations.  Year, month and day are not relevent in our context and are omitted.</documentation>

+			<documentation xml:lang="en">ISO 8601 pattern used to denote program durations.  Year, month and day are not relevant in our context and are omitted.</documentation>

 		</annotation>

 		<restriction base="xsd:duration">

 			<pattern value="PT[0-9][0-9]H[0-5][0-9]M"/>

@@ -484,7 +484,7 @@
 									</attribute>

 									<attribute name="to" type="tms:date" use="optional">

 										<annotation>

-											<documentation xml:lang="en">Date untill which the mapping is valid, within the validity period of the whole XTVD document. @IMPORTANT : The change will occur at midnight.</documentation>

+											<documentation xml:lang="en">Date until which the mapping is valid, within the validity period of the whole XTVD document. @IMPORTANT : The change will occur at midnight.</documentation>

 										</annotation>

 									</attribute>

 								</complexType>

diff --git a/ext/soap/tests/bugs/bug28985.phpt b/ext/soap/tests/bugs/bug28985.phpt
index 59d96e2c7..73ff899c3 100644
--- a/ext/soap/tests/bugs/bug28985.phpt
+++ b/ext/soap/tests/bugs/bug28985.phpt
@@ -44,10 +44,10 @@ array(42) {
  string iUserPassword;
 }"
   [8]=>
-  string(86) "struct MGCodeLibelle {
+  string(87) "struct MGCodeLibelle {
  string Code;
  string Libelle;
- boolean Defaut;
+ boolean Default;
  anyType Tag;
 }"
   [9]=>
@@ -203,4 +203,4 @@ array(42) {
   string(76) "struct GetEnvironnementResponse {
  MGEnvironnement GetEnvironnementResult;
 }"
-}
\ No newline at end of file
+}
diff --git a/ext/soap/tests/bugs/bug28985.wsdl b/ext/soap/tests/bugs/bug28985.wsdl
index ee528818b..50c2fcda8 100644
--- a/ext/soap/tests/bugs/bug28985.wsdl
+++ b/ext/soap/tests/bugs/bug28985.wsdl
@@ -67,7 +67,7 @@ type="s:string" />
 type="s:string" />

           <s:element minOccurs="0" maxOccurs="1" name="Libelle"

 type="s:string" />

-          <s:element minOccurs="1" maxOccurs="1" name="Defaut"

+          <s:element minOccurs="1" maxOccurs="1" name="Default"

 type="s:boolean" />

           <s:element minOccurs="0" maxOccurs="1" name="Tag" />

         </s:sequence>

diff --git a/ext/soap/tests/bugs/bug65018.phpt b/ext/soap/tests/bugs/bug65018.phpt
new file mode 100644
index 000000000..bbb9b5e42
--- /dev/null
+++ b/ext/soap/tests/bugs/bug65018.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Bug #65018 (SoapHeader problems with SoapServer)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+	class Tool{
+		public function TOKEN($id){
+			return new SoapHeader('namespace1', 'TOKEN', $id, true);
+		}
+		public function Method(){}
+	}
+
+	$input = $input =
+		'<?xml version="1.0"?>'.PHP_EOL.
+		'<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="namespace1"'.
+		' xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.
+		' xmlns:xsd="http://www.w3.org/2001/XMLSchema">'.
+		'<SOAP-ENV:Header><ns1:TOKEN soapenv:mustUnderstand="1">abc</ns1:TOKEN></SOAP-ENV:Header>'.
+		'<SOAP-ENV:Body><ns1:Method /></SOAP-ENV:Body></SOAP-ENV:Envelope>';
+
+	$soap = new SoapServer(null, array('uri' => '127.0.0.1'));
+	$soap->setClass('Tool');
+	$soap->handle($input);
+?>
+--EXPECT--
+<?xml version="1.0" encoding="UTF-8"?>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="namespace1" xmlns:ns2="127.0.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAP-ENV:Header><ns1:TOKEN SOAP-ENV:mustUnderstand="1">abc</ns1:TOKEN></SOAP-ENV:Header><SOAP-ENV:Body><ns2:MethodResponse><return xsi:nil="true"/></ns2:MethodResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 06bd0ec6b..d0d029464 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -352,7 +352,7 @@ const zend_function_entry sockets_functions[] = {
 	PHP_FE(socket_clear_error,		arginfo_socket_clear_error)
 	PHP_FE(socket_import_stream,	arginfo_socket_import_stream)
 
-	/* for downwards compatability */
+	/* for downwards compatibility */
 	PHP_FALIAS(socket_getopt, socket_get_option, arginfo_socket_get_option)
 	PHP_FALIAS(socket_setopt, socket_set_option, arginfo_socket_set_option)
 
@@ -843,6 +843,9 @@ PHP_MINIT_FUNCTION(sockets)
 	REGISTER_LONG_CONSTANT("SO_RCVTIMEO",	SO_RCVTIMEO,	CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("SO_TYPE",		SO_TYPE,		CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("SO_ERROR",		SO_ERROR,		CONST_CS | CONST_PERSISTENT);
+#ifdef SO_BINDTODEVICE
+	REGISTER_LONG_CONSTANT("SO_BINDTODEVICE",       SO_BINDTODEVICE,        CONST_CS | CONST_PERSISTENT);
+#endif
 	REGISTER_LONG_CONSTANT("SOL_SOCKET",	SOL_SOCKET,		CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("SOMAXCONN",		SOMAXCONN,		CONST_CS | CONST_PERSISTENT);
 #ifdef TCP_NODELAY
@@ -1822,8 +1825,8 @@ PHP_FUNCTION(socket_recvfrom)
 			retval = recvfrom(php_sock->bsd_socket, recv_buf, arg3, arg4, (struct sockaddr *)&s_un, (socklen_t *)&slen);
 
 			if (retval < 0) {
-				efree(recv_buf);
 				PHP_SOCKET_ERROR(php_sock, "unable to recvfrom", errno);
+				efree(recv_buf);
 				RETURN_FALSE;
 			}
 
@@ -1847,8 +1850,8 @@ PHP_FUNCTION(socket_recvfrom)
 			retval = recvfrom(php_sock->bsd_socket, recv_buf, arg3, arg4, (struct sockaddr *)&sin, (socklen_t *)&slen);
 
 			if (retval < 0) {
-				efree(recv_buf);
 				PHP_SOCKET_ERROR(php_sock, "unable to recvfrom", errno);
+				efree(recv_buf);
 				RETURN_FALSE;
 			}
 
@@ -1876,8 +1879,8 @@ PHP_FUNCTION(socket_recvfrom)
 			retval = recvfrom(php_sock->bsd_socket, recv_buf, arg3, arg4, (struct sockaddr *)&sin6, (socklen_t *)&slen);
 
 			if (retval < 0) {
-				efree(recv_buf);
 				PHP_SOCKET_ERROR(php_sock, "unable to recvfrom", errno);
+				efree(recv_buf);
 				RETURN_FALSE;
 			}
 
@@ -2355,7 +2358,19 @@ ipv6_loop_hops:
 #endif
 			break;
 		}
-		
+#ifdef SO_BINDTODEVICE
+		case SO_BINDTODEVICE: {
+			if (Z_TYPE_PP(arg4) == IS_STRING) {
+				opt_ptr = Z_STRVAL_PP(arg4);
+				optlen = Z_STRLEN_PP(arg4);
+			} else {
+				opt_ptr = "";
+				optlen = 0;
+			}
+			break;
+		}
+#endif
+
 		default:
 			convert_to_long_ex(arg4);
 			ov = Z_LVAL_PP(arg4);
diff --git a/ext/sockets/tests/socket_set_option_bindtodevice.phpt b/ext/sockets/tests/socket_set_option_bindtodevice.phpt
new file mode 100644
index 000000000..05d718ce6
--- /dev/null
+++ b/ext/sockets/tests/socket_set_option_bindtodevice.phpt
@@ -0,0 +1,40 @@
+--TEST--
+Test if socket_set_option() works, option:SO_BINDTODEVICE
+--DESCRIPTION--
+-Bind to loopback 'lo' device (should exist)
+-Bind to unexisting device
+--SKIPIF--
+<?php
+if (!extension_loaded('sockets')) {
+        die('SKIP sockets extension not available.');
+}
+if (!defined("SO_BINDTODEVICE")) {
+	die('SKIP SO_BINDTODEVICE not supported on this platform.');
+}
+if (!function_exists("posix_getuid") || posix_getuid() != 0) {
+	die('SKIP SO_BINDTODEVICE requires root permissions.');
+}
+?>
+--FILE--
+<?php
+$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
+
+if (!$socket) {
+        die('Unable to create AF_INET socket [socket]');
+}
+// wrong params
+$retval_1 = socket_set_option( $socket, SOL_SOCKET, SO_BINDTODEVICE, "lo");
+var_dump($retval_1);
+$retval_2 = socket_set_option( $socket, SOL_SOCKET, SO_BINDTODEVICE, "ethIDONOTEXIST");
+var_dump($retval_2);
+
+socket_close($socket);
+?>
+
+--EXPECTF--
+bool(true)
+
+Warning: socket_set_option(): unable to set socket option [19]: No such device in %s on line %d
+bool(false)
+--CREDITS--
+Damjan Cvetko, foreach.org
diff --git a/ext/spl/internal/cachingiterator.inc b/ext/spl/internal/cachingiterator.inc
index 33258ab95..4d4bf8dbf 100644
--- a/ext/spl/internal/cachingiterator.inc
+++ b/ext/spl/internal/cachingiterator.inc
@@ -23,7 +23,7 @@
  *       flag CALL_TOSTRING to do the conversion when the actual element
  *       is being fetched. Otherwise the conversion would happen with the
  *       already changed iterator. If you do not need this then it you should
- *       omit this flag because it costs unneccessary work and time.
+ *       omit this flag because it costs unnecessary work and time.
  */
 class CachingIterator implements OuterIterator
 {
diff --git a/ext/spl/internal/iteratoriterator.inc b/ext/spl/internal/iteratoriterator.inc
index 37676e053..451d05da3 100644
--- a/ext/spl/internal/iteratoriterator.inc
+++ b/ext/spl/internal/iteratoriterator.inc
@@ -17,7 +17,7 @@
  * an Iterator. It is very important to understand that most classes that do 
  * not implement Iterator have their reasone to. Most likely they do not allow
  * the full Iterator feature set. If so you need to provide techniques to
- * prevent missuse. If you do not you must expect exceptions or fatal erros.
+ * prevent missuse. If you do not you must expect exceptions or fatal errors.
  *
  * It is also possible to derive the class and implement IteratorAggregate by
  * downcasting the instances returned in getIterator. See the following
diff --git a/ext/spl/internal/multipleiterator.inc b/ext/spl/internal/multipleiterator.inc
index 2ed71d53a..12df011ec 100644
--- a/ext/spl/internal/multipleiterator.inc
+++ b/ext/spl/internal/multipleiterator.inc
@@ -163,7 +163,7 @@ class MultipleIterator implements Iterator
 		$retval = array();
 		foreach($this->iterators as $iter)
 		{
-			if ($it->valid())
+			if ($iter->valid())
 			{
 				if ($this->flags & self::MIT_KEYS_ASSOC)
 				{
@@ -205,7 +205,7 @@ class MultipleIterator implements Iterator
 		$retval = array();
 		foreach($this->iterators as $iter)
 		{
-			if ($it->valid())
+			if ($iter->valid())
 			{
 				$retval[] = $iter->key();
 			}
diff --git a/ext/spl/internal/splobjectstorage.inc b/ext/spl/internal/splobjectstorage.inc
index fa164066c..ffc6c9948 100644
--- a/ext/spl/internal/splobjectstorage.inc
+++ b/ext/spl/internal/splobjectstorage.inc
@@ -16,7 +16,7 @@
  * @since PHP 5.1.2
  *
  * This container allows to store objects uniquly without the need to compare
- * them one by one. This is only possible internally. The code represenation
+ * them one by one. This is only possible internally. The code representation
  * here therefore has a complexity of O(n) while the actual implementation has
  * complexity O(1).
  */
diff --git a/ext/spl/spl.php b/ext/spl/spl.php
index fdffda368..3638a5a2b 100755
--- a/ext/spl/spl.php
+++ b/ext/spl/spl.php
@@ -260,7 +260,7 @@ class Exception
 	/** The exception message */
 	protected $message;
 
-	/** The string represenations as generated during construction */
+	/** The string representations as generated during construction */
 	private $string;
 
 	/** The code passed to the constructor */
@@ -336,7 +336,7 @@ class Exception
 	{
 	}
 
-	/** @return string represenation of exception
+	/** @return string representation of exception
 	 */
 	public function __toString()
 	{
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index 2c2c87d02..552f67b18 100644
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -166,7 +166,7 @@ zend_object_iterator *spl_array_get_iterator(zend_class_entry *ce, zval *object,
 /* {{{ spl_array_object_new_ex */
 static zend_object_value spl_array_object_new_ex(zend_class_entry *class_type, spl_array_object **obj, zval *orig, int clone_orig TSRMLS_DC)
 {
-	zend_object_value retval;
+	zend_object_value retval = {0};
 	spl_array_object *intern;
 	zval *tmp;
 	zend_class_entry * parent = class_type;
@@ -1658,7 +1658,7 @@ SPL_METHOD(Array, getChildren)
 			return;
 		}
 		if (instanceof_function(Z_OBJCE_PP(entry), Z_OBJCE_P(getThis()) TSRMLS_CC)) {
-			RETURN_ZVAL(*entry, 0, 0);
+			RETURN_ZVAL(*entry, 1, 0);
 		}
 	}
 
@@ -1778,7 +1778,7 @@ SPL_METHOD(Array, unserialize)
 	++p;
 
 	if (*p!='m') {
-		if (*p!='a' && *p!='O' && *p!='C') {
+		if (*p!='a' && *p!='O' && *p!='C' && *p!='r') {
 			goto outexcept;
 		}
 		intern->ar_flags &= ~SPL_ARRAY_CLONE_MASK;
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index f43a3709e..7f0ce631b 100644
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -710,6 +710,12 @@ void spl_filesystem_object_construct(INTERNAL_FUNCTION_PARAMETERS, long ctor_fla
 	}
 
 	intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+	if (intern->_path) {
+		/* object is alreay initialized */
+		zend_restore_error_handling(&error_handling TSRMLS_CC);
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Directory object is already initialized");
+		return;
+	}
 	intern->flags = flags;
 #ifdef HAVE_GLOB
 	if (SPL_HAS_FLAG(ctor_flags, DIT_CTOR_GLOB) && strstr(path, "glob://") != path) {
@@ -1504,7 +1510,7 @@ SPL_METHOD(RecursiveDirectoryIterator, hasChildren)
    Returns an iterator for the current entry if it is a directory */
 SPL_METHOD(RecursiveDirectoryIterator, getChildren)
 {
-	zval zpath, zflags;
+	zval *zpath, *zflags;
 	spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
 	spl_filesystem_object *subdir;
 	char slash = SPL_HAS_FLAG(intern->flags, SPL_FILE_DIR_UNIXPATHS) ? '/' : DEFAULT_SLASH;
@@ -1518,11 +1524,13 @@ SPL_METHOD(RecursiveDirectoryIterator, getChildren)
 	if (SPL_HAS_FLAG(intern->flags, SPL_FILE_DIR_CURRENT_AS_PATHNAME)) {
 		RETURN_STRINGL(intern->file_name, intern->file_name_len, 1);
 	} else {
-		INIT_PZVAL(&zflags);
-		INIT_PZVAL(&zpath);
-		ZVAL_LONG(&zflags, intern->flags);
-		ZVAL_STRINGL(&zpath, intern->file_name, intern->file_name_len, 0);
-		spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), &return_value, 0, &zpath, &zflags TSRMLS_CC);
+		MAKE_STD_ZVAL(zflags);
+		MAKE_STD_ZVAL(zpath);
+		ZVAL_LONG(zflags, intern->flags);
+		ZVAL_STRINGL(zpath, intern->file_name, intern->file_name_len, 1);
+		spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), &return_value, 0, zpath, zflags TSRMLS_CC);
+		zval_ptr_dtor(&zpath);
+		zval_ptr_dtor(&zflags);
 		
 		subdir = (spl_filesystem_object*)zend_object_store_get_object(return_value TSRMLS_CC);
 		if (subdir) {
diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c
index 215476a72..f7be97d4c 100644
--- a/ext/spl/spl_dllist.c
+++ b/ext/spl/spl_dllist.c
@@ -368,7 +368,7 @@ zend_object_iterator *spl_dllist_get_iterator(zend_class_entry *ce, zval *object
 
 static zend_object_value spl_dllist_object_new_ex(zend_class_entry *class_type, spl_dllist_object **obj, zval *orig, int clone_orig TSRMLS_DC) /* {{{ */
 {
-	zend_object_value  retval;
+	zend_object_value  retval = {0};
 	spl_dllist_object *intern;
 	zend_class_entry  *parent = class_type;
 	int                inherited = 0;
diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c
index ebc4e341a..fec7e2c4a 100644
--- a/ext/spl/spl_fixedarray.c
+++ b/ext/spl/spl_fixedarray.c
@@ -604,6 +604,38 @@ SPL_METHOD(SplFixedArray, __construct)
 }
 /* }}} */
 
+/* {{{ proto void SplFixedArray::__wakeup()
+*/
+SPL_METHOD(SplFixedArray, __wakeup)
+{
+	spl_fixedarray_object *intern = (spl_fixedarray_object *) zend_object_store_get_object(getThis() TSRMLS_CC);
+	HashPosition ptr;
+	HashTable *intern_ht = zend_std_get_properties(getThis() TSRMLS_CC);
+	zval **data;
+
+	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "")) {
+		return;
+	}
+
+	if (!intern->array) {
+		int index = 0;
+		int size = zend_hash_num_elements(intern_ht);
+
+		intern->array = emalloc(sizeof(spl_fixedarray));
+		spl_fixedarray_init(intern->array, size TSRMLS_CC);
+
+		for (zend_hash_internal_pointer_reset_ex(intern_ht, &ptr); zend_hash_get_current_data_ex(intern_ht, (void **) &data, &ptr) == SUCCESS; zend_hash_move_forward_ex(intern_ht, &ptr)) {
+			Z_ADDREF_PP(data);
+			intern->array->elements[index++] = *data;
+		}
+
+		/* Remove the unserialised properties, since we now have the elements
+		 * within the spl_fixedarray_object structure. */
+		zend_hash_clean(intern_ht);
+	}
+}
+/* }}} */
+
 /* {{{ proto int SplFixedArray::count(void)
 */
 SPL_METHOD(SplFixedArray, count)
@@ -1086,6 +1118,7 @@ ZEND_END_ARG_INFO()
 
 static zend_function_entry spl_funcs_SplFixedArray[] = { /* {{{ */
 	SPL_ME(SplFixedArray, __construct,     arginfo_splfixedarray_construct,ZEND_ACC_PUBLIC)
+	SPL_ME(SplFixedArray, __wakeup,        arginfo_splfixedarray_void,     ZEND_ACC_PUBLIC)
 	SPL_ME(SplFixedArray, count,           arginfo_splfixedarray_void,     ZEND_ACC_PUBLIC)
 	SPL_ME(SplFixedArray, toArray,         arginfo_splfixedarray_void,     ZEND_ACC_PUBLIC)
 	SPL_ME(SplFixedArray, fromArray,       arginfo_fixedarray_fromArray,   ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index e6cd155a8..eb8247654 100644
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -1027,12 +1027,12 @@ static void spl_recursive_tree_iterator_get_entry(spl_recursive_it_object * obje
 	zend_replace_error_handling(EH_THROW, spl_ce_UnexpectedValueException, &error_handling TSRMLS_CC);
 	if (data && *data) {
 		RETVAL_ZVAL(*data, 1, 0);
-	}
-	if (Z_TYPE_P(return_value) == IS_ARRAY) {
-		zval_dtor(return_value);
-		ZVAL_STRINGL(return_value, "Array", sizeof("Array")-1, 1);
-	} else {
-		convert_to_string(return_value);
+		if (Z_TYPE_P(return_value) == IS_ARRAY) {
+			zval_dtor(return_value);
+			ZVAL_STRINGL(return_value, "Array", sizeof("Array")-1, 1);
+		} else {
+			convert_to_string(return_value);
+		}
 	}
 	zend_restore_error_handling(&error_handling TSRMLS_CC);
 }
@@ -1133,8 +1133,15 @@ SPL_METHOD(RecursiveTreeIterator, current)
 		}
 	}
 
+	INIT_ZVAL(prefix);
+	INIT_ZVAL(entry);
 	spl_recursive_tree_iterator_get_prefix(object, &prefix TSRMLS_CC);
 	spl_recursive_tree_iterator_get_entry(object, &entry TSRMLS_CC);
+	if (Z_TYPE(entry) != IS_STRING) {
+		zval_dtor(&prefix);
+		zval_dtor(&entry);
+		RETURN_NULL();
+	}
 	spl_recursive_tree_iterator_get_postfix(object, &postfix TSRMLS_CC);
 
 	str_len = Z_STRLEN(prefix) + Z_STRLEN(entry) + Z_STRLEN(postfix);
diff --git a/ext/spl/tests/SplFileInfo_getInode_basic.phpt b/ext/spl/tests/SplFileInfo_getInode_basic.phpt
index 902cbb31c..380b865cd 100644
--- a/ext/spl/tests/SplFileInfo_getInode_basic.phpt
+++ b/ext/spl/tests/SplFileInfo_getInode_basic.phpt
@@ -16,15 +16,15 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms
 <?php

 
 //file
-touch ('test_file_ptfi');
-$fileInfo = new SplFileInfo('test_file_ptfi');
-$result = shell_exec('ls -i test_file_ptfi');
+touch ('SplFileInfo_getInode_basic.txt');
+$fileInfo = new SplFileInfo('SplFileInfo_getInode_basic.txt');
+$result = shell_exec('ls -i SplFileInfo_getInode_basic.txt');
 var_dump($fileInfo->getInode() == $result);
 
 ?>
 --CLEAN--
 <?php
-unlink('test_file_ptfi');
+unlink('SplFileInfo_getInode_basic.txt');
 ?>

 --EXPECTF--

 bool(true)
diff --git a/ext/spl/tests/SplFileInfo_getPerms_basic.phpt b/ext/spl/tests/SplFileInfo_getPerms_basic.phpt
index e9b7beaa9..53591f341 100644
--- a/ext/spl/tests/SplFileInfo_getPerms_basic.phpt
+++ b/ext/spl/tests/SplFileInfo_getPerms_basic.phpt
@@ -16,15 +16,15 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test not for Windows platforms
 <?php

 
 //file
-touch ('test_file_ptfi');
-chmod('test_file_ptfi', 0557);
-$fileInfo = new SplFileInfo('test_file_ptfi');
+touch ('SplFileInfo_getPerms_basic.txt');
+chmod('SplFileInfo_getPerms_basic.txt', 0557);
+$fileInfo = new SplFileInfo('SplFileInfo_getPerms_basic.txt');
 var_dump($fileInfo->getPerms() == 0100557);
 
 ?>
 --CLEAN--
 <?php
-unlink('test_file_ptfi');
+unlink('SplFileInfo_getPerms_basic.txt');
 ?>

 --EXPECTF--

 bool(true)
diff --git a/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt b/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt
index 32705f091..4402d6ca4 100644
--- a/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt
+++ b/ext/spl/tests/SplFileObject_fgetcsv_delimiter_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SplFileObject::fgetcsv with alternative delimeter
+SplFileObject::fgetcsv with alternative delimiter
 --FILE--
 <?php
 $fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
diff --git a/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt b/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt
index 942c7619d..64d6514a2 100644
--- a/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt
+++ b/ext/spl/tests/SplFileObject_fgetcsv_delimiter_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SplFileObject::fgetcsv with alternative delimeter
+SplFileObject::fgetcsv with alternative delimiter
 --FILE--
 <?php
 $fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
diff --git a/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt b/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt
index ee2497252..efbb5fb68 100644
--- a/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt
+++ b/ext/spl/tests/SplFileObject_fgetcsv_enclosure_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SplFileObject::fgetcsv with alternative delimeter
+SplFileObject::fgetcsv with alternative delimiter
 --FILE--
 <?php
 $fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
diff --git a/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt b/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt
index 5430e5375..7487b8353 100644
--- a/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt
+++ b/ext/spl/tests/SplFileObject_fgetcsv_enclosure_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SplFileObject::fgetcsv with alternative delimeter
+SplFileObject::fgetcsv with alternative delimiter
 --FILE--
 <?php
 $fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
diff --git a/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt b/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt
index 96c029095..1a94532b2 100644
--- a/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt
+++ b/ext/spl/tests/SplFileObject_fgetcsv_escape_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SplFileObject::fgetcsv with alternative delimeter
+SplFileObject::fgetcsv with alternative delimiter
 --FILE--
 <?php
 $fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
diff --git a/ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt b/ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt
index a57031899..fd90103bf 100644
--- a/ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt
+++ b/ext/spl/tests/SplFileObject_fgetcsv_escape_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SplFileObject::fgetcsv with alternative delimeter
+SplFileObject::fgetcsv with alternative delimiter
 --FILE--
 <?php
 $fp = fopen('SplFileObject__fgetcsv.csv', 'w+');
diff --git a/ext/spl/tests/SplFixedArray_serialize.phpt b/ext/spl/tests/SplFixedArray_serialize.phpt
new file mode 100644
index 000000000..f99812ecc
--- /dev/null
+++ b/ext/spl/tests/SplFixedArray_serialize.phpt
@@ -0,0 +1,52 @@
+--TEST--
+SplFixedArray serialisation
+--FILE--
+<?php
+
+$array = new SplFixedArray(5);
+
+$obj = new stdClass;
+$obj->prop = 'value';
+
+$array[0] = 'foo';
+$array[2] = 42;
+$array[3] = $obj;
+$array[4] = range(1, 5);
+
+$ser = serialize($array);
+echo "$ser\n";
+$unser = unserialize($ser);
+
+printf("count: %d\n", count($unser));
+printf("getSize(): %d\n", $unser->getSize());
+
+var_dump($unser[0], $unser[1], $unser[2], $unser[3], $unser[4]);
+
+$unser[4] = 'quux';
+var_dump($unser[4]);
+
+?>
+--EXPECT--
+O:13:"SplFixedArray":5:{i:0;s:3:"foo";i:1;N;i:2;i:42;i:3;O:8:"stdClass":1:{s:4:"prop";s:5:"value";}i:4;a:5:{i:0;i:1;i:1;i:2;i:2;i:3;i:3;i:4;i:4;i:5;}}
+count: 5
+getSize(): 5
+string(3) "foo"
+NULL
+int(42)
+object(stdClass)#4 (1) {
+  ["prop"]=>
+  string(5) "value"
+}
+array(5) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+  [3]=>
+  int(4)
+  [4]=>
+  int(5)
+}
+string(4) "quux"
diff --git a/ext/spl/tests/bug61828.phpt b/ext/spl/tests/bug61828.phpt
new file mode 100644
index 000000000..04d435e6d
--- /dev/null
+++ b/ext/spl/tests/bug61828.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Bug #61828 (Memleak when calling Directory(Recursive)Iterator/Spl(Temp)FileObject ctor twice)
+--FILE--
+<?php
+$x = new DirectoryIterator('.');
+$x->__construct('/tmp');
+echo "Okey";
+?>
+--EXPECTF--
+Warning: DirectoryIterator::__construct(): Directory object is already initialized in %sbug61828.php on line 3
+Okey
diff --git a/ext/spl/tests/bug62672.phpt b/ext/spl/tests/bug62672.phpt
new file mode 100644
index 000000000..d0d6a6245
--- /dev/null
+++ b/ext/spl/tests/bug62672.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Bug #62672 (Error on serialize of ArrayObject)
+--FILE--
+<?php
+
+class ObjA
+{
+    private $_varA;
+
+    public function __construct(Iterator $source)
+    {
+        $this->_varA = $source;
+    }
+}
+
+class ObjB extends ObjA
+{
+    private $_varB;
+
+    public function __construct(ArrayObject $keys)
+    {
+        $this->_varB = $keys;
+        parent::__construct($keys->getIterator());
+    }
+}
+
+$obj = new ObjB(new ArrayObject());
+
+var_dump($obj == unserialize(serialize($obj)));
+--EXPECTF--
+bool(true)
diff --git a/ext/spl/tests/bug63680.phpt b/ext/spl/tests/bug63680.phpt
index 3a20c4bb1..0b5c35dc7 100644
--- a/ext/spl/tests/bug63680.phpt
+++ b/ext/spl/tests/bug63680.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #63680 (Memleak in splfixedarray with cycle reference)
+--INI--
+zend.enable_gc=1
 --FILE--
 <?php
 function dummy() {
diff --git a/ext/spl/tests/bug65328.phpt b/ext/spl/tests/bug65328.phpt
new file mode 100644
index 000000000..32e6c24fa
--- /dev/null
+++ b/ext/spl/tests/bug65328.phpt
@@ -0,0 +1,348 @@
+--TEST--
+Bug #65328 (Segfault when getting SplStack object Value)
+--FILE--
+<?php
+/**
+ * @author AlexanderC
+ */
+
+class Tree
+{
+    /**
+     * @var Node
+     */
+    protected $head;
+
+    /**
+     * @param Node $head
+     */
+    public function __construct(Node $head = null)
+    {
+        $this->head = $head ? : new Node('HEAD');
+    }
+
+    /**
+     * @return Node
+     */
+    public function getHead()
+    {
+        return $this->head;
+    }
+
+    /**
+     * @param mixed $uid
+     * @return Node|bool
+     */
+    public function find($uid)
+    {
+        $iterator = $this->getIterator();
+
+        /** @var Node $node */
+        foreach($iterator as $node) {
+            if($node->getUid() === $uid) {
+                return $node;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param mixed $uid
+     * @return \SplStack
+     */
+    public function & findAll($uid)
+    {
+        $result = new \SplStack();
+
+        /** @var Node $node */
+        foreach($this->getIterator() as $node) {
+            if($node->getUid() == $uid) {
+                $result->push($node);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @return \RecursiveIteratorIterator
+     */
+    public function getIterator()
+    {
+        return new \RecursiveIteratorIterator(
+            $this->head->getChildren(),
+            \RecursiveIteratorIterator::SELF_FIRST
+        );
+    }
+}
+
+class Node extends \RecursiveArrayIterator implements \Countable
+{
+    /**
+     * @var array
+     */
+    protected $children = [];
+
+    /**
+     * @var Node
+     */
+    protected $parent;
+
+    /**
+     * @var mixed
+     */
+    protected $data;
+
+    /**
+     * @var mixed
+     */
+    protected $uid;
+
+    /**
+     * @var int
+     */
+    protected $index = 0;
+
+    /**
+     * @var bool
+     */
+    protected $assureUnique;
+
+    /**
+     * @param mixed $data
+     * @param mixed $uid
+     * @param Node $parent
+     * @param bool $assureUnique
+     */
+    public function __construct($data, $uid = null, Node $parent = null, $assureUnique = false)
+    {
+        if(null !== $parent) {
+            $this->parent = $parent;
+        }
+
+        $this->data = $data;
+        $this->uid = $uid ? : uniqid(sha1(serialize($data)), true);
+        $this->assureUnique = $assureUnique;
+    }
+
+    /**
+     * @param mixed $uid
+     */
+    public function setUid($uid)
+    {
+        $this->uid = $uid;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getUid()
+    {
+        return $this->uid;
+    }
+
+    /**
+     * @param Node $child
+     */
+    public function addChild(Node $child)
+    {
+        $child->setParent($this);
+        $this->children[] = $child;
+    }
+
+    /**
+     * @param array $children
+     */
+    public function setChildren(array $children)
+    {
+        $this->children = $children;
+    }
+
+    /**
+     * @return array
+     */
+    public function getChildrenArray()
+    {
+        return $this->children;
+    }
+
+    /**
+     * @param mixed $data
+     */
+    public function setData($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
+
+    /**
+     * @param Node $parent
+     * @throws \RuntimeException
+     */
+    public function setParent(Node $parent)
+    {
+        if(true === $this->assureUnique && !self::checkUnique($parent, $this->uid)) {
+            throw new \RuntimeException("Node uid is not unique in assigned node tree");
+        }
+
+        $this->parent = $parent;
+    }
+
+    /**
+     * @param Node $node
+     * @param mixed $uid
+     * @return bool
+     */
+    protected static function checkUnique(Node $node, $uid)
+    {
+        $headNode = $node;
+        do {
+            $headNode = $node;
+        } while($node = $node->getParent());
+
+        $tree = new Tree($headNode);
+
+        return !$tree->find($uid);
+    }
+
+    /**
+     * @return \IJsonRPC\Helpers\Tree\Node
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * @return Node
+     */
+    public function current()
+    {
+        return $this->children[$this->index];
+    }
+
+    /**
+     * @return scalar
+     */
+    public function key()
+    {
+        return $this->index;
+    }
+
+    /**
+     * @return void
+     */
+    public function next()
+    {
+        ++$this->index;
+    }
+
+    /**
+     * @return void
+     */
+    public function rewind()
+    {
+        $this->index = 0;
+    }
+
+    /**
+     * @return bool
+     */
+    public function valid()
+    {
+        return array_key_exists($this->index, $this->children);
+    }
+
+    /**
+     * @return int
+     */
+    public function count()
+    {
+        return count($this->children);
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasChildren()
+    {
+        return !empty($this->children);
+    }
+
+    /**
+     * @return \RecursiveArrayIterator
+     */
+    public function getChildren()
+    {
+        return new \RecursiveArrayIterator($this->children);
+    }
+}
+
+$tree = new Tree();
+$node1 = new Node('value1', 1);
+$tree->getHead()->addChild($node1);
+$node2 = new Node('value2', 2);
+$node1->addChild($node2);
+
+print_r($tree->findAll(2)->offsetGet(0));
+--EXPECTF--
+Node Object
+(
+    [children:protected] => Array
+        (
+        )
+
+    [parent:protected] => Node Object
+        (
+            [children:protected] => Array
+                (
+                    [0] => Node Object
+ *RECURSION*
+                )
+
+            [parent:protected] => Node Object
+                (
+                    [children:protected] => Array
+                        (
+                            [0] => Node Object
+ *RECURSION*
+                        )
+
+                    [parent:protected] => 
+                    [data:protected] => HEAD
+                    [uid:protected] => %s
+                    [index:protected] => 0
+                    [assureUnique:protected] => 
+                    [storage:ArrayIterator:private] => Array
+                        (
+                        )
+
+                )
+
+            [data:protected] => value1
+            [uid:protected] => 1
+            [index:protected] => 1
+            [assureUnique:protected] => 
+            [storage:ArrayIterator:private] => Array
+                (
+                )
+
+        )
+
+    [data:protected] => value2
+    [uid:protected] => 2
+    [index:protected] => 0
+    [assureUnique:protected] => 
+    [storage:ArrayIterator:private] => Array
+        (
+        )
+
+)
diff --git a/ext/spl/tests/iterator_031.phpt b/ext/spl/tests/iterator_031.phpt
index 40342f4bb..8bd3ca7c5 100644
--- a/ext/spl/tests/iterator_031.phpt
+++ b/ext/spl/tests/iterator_031.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SPL: AppendIterator::append() rewinds when neccessary
+SPL: AppendIterator::append() rewinds when necessary
 --FILE--
 <?php
 
diff --git a/ext/spl/tests/spl_004.phpt b/ext/spl/tests/spl_004.phpt
index 97896f815..d56f48f89 100644
--- a/ext/spl/tests/spl_004.phpt
+++ b/ext/spl/tests/spl_004.phpt
@@ -43,8 +43,8 @@ var_dump(iterator_apply($it, 'test'));
 
 echo "===ERRORS===\n";
 var_dump(iterator_apply($it, 'test', 1));
-var_dump(iterator_apply($it, 'non_existing_functon'));
-var_dump(iterator_apply($it, 'non_existing_functon', NULL, 2));
+var_dump(iterator_apply($it, 'non_existing_function'));
+var_dump(iterator_apply($it, 'non_existing_function', NULL, 2));
 
 ?>
 ===DONE===
@@ -77,7 +77,7 @@ int(4)
 Error: Argument 3 passed to iterator_apply() must be of the type array, integer given
 Error: iterator_apply() expects parameter 3 to be array, integer given
 NULL
-Error: iterator_apply() expects parameter 2 to be a valid callback, function 'non_existing_functon' not found or invalid function name
+Error: iterator_apply() expects parameter 2 to be a valid callback, function 'non_existing_function' not found or invalid function name
 NULL
 Error: iterator_apply() expects at most 3 parameters, 4 given
 NULL
diff --git a/ext/spl/tests/spl_priorityqeue_insert_two_params_error.phpt b/ext/spl/tests/spl_priorityqeue_insert_two_params_error.phpt
index 659ffb4bc..076c68771 100644
--- a/ext/spl/tests/spl_priorityqeue_insert_two_params_error.phpt
+++ b/ext/spl/tests/spl_priorityqeue_insert_two_params_error.phpt
@@ -1,5 +1,5 @@
 --TEST--
-SPL: priorityQueue paramter test on insert method
+SPL: priorityQueue parameter test on insert method
 --CREDITS--
 Sean Burlington www.practicalweb.co.uk
 TestFest London May 2009
diff --git a/ext/sqlite3/libsqlite/sqlite3.c b/ext/sqlite3/libsqlite/sqlite3.c
index d96367e21..3d71ebb18 100644
--- a/ext/sqlite3/libsqlite/sqlite3.c
+++ b/ext/sqlite3/libsqlite/sqlite3.c
@@ -361,7 +361,7 @@
 ** The SQLITE_THREADSAFE macro must be defined as 0, 1, or 2.
 ** 0 means mutexes are permanently disable and the library is never
 ** threadsafe.  1 means the library is serialized which is the highest
-** level of threadsafety.  2 means the libary is multithreaded - multiple
+** level of threadsafety.  2 means the library is multithreaded - multiple
 ** threads can use SQLite as long as no two threads try to use the same
 ** database connection at the same time.
 **
@@ -11864,7 +11864,7 @@ SQLITE_PRIVATE   int sqlite3MemdebugNoType(void*,u8);
 **
 *************************************************************************
 **
-** This file contains definitions of global variables and contants.
+** This file contains definitions of global variables and constants.
 */
 
 /* An array to map all upper-case characters into their corresponding
@@ -12731,7 +12731,7 @@ struct VdbeFunc {
 */
 struct sqlite3_context {
   FuncDef *pFunc;       /* Pointer to function information.  MUST BE FIRST */
-  VdbeFunc *pVdbeFunc;  /* Auxilary data, if created. */
+  VdbeFunc *pVdbeFunc;  /* Auxiliary data, if created. */
   Mem s;                /* The return value is stored here */
   Mem *pMem;            /* Memory cell used to store aggregate context */
   int isError;          /* Error code returned by the function. */
@@ -16130,7 +16130,7 @@ SQLITE_PRIVATE const sqlite3_mem_methods *sqlite3MemGetMemsys3(void){
 **   1.  All memory allocations sizes are rounded up to a power of 2.
 **
 **   2.  If two adjacent free blocks are the halves of a larger block,
-**       then the two blocks are coalesed into the single larger block.
+**       then the two blocks are coalesced into the single larger block.
 **
 **   3.  New memory is allocated from the first available free block.
 **
@@ -19267,7 +19267,7 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
         }
         if( xtype==etGENERIC && precision>0 ) precision--;
 #if 0
-        /* Rounding works like BSD when the constant 0.4999 is used.  Wierd! */
+        /* Rounding works like BSD when the constant 0.4999 is used.  Weird! */
         for(idx=precision, rounder=0.4999; idx>0; idx--, rounder*=0.1);
 #else
         /* It makes more sense to use 0.5 */
@@ -20926,7 +20926,7 @@ do_atof_calc:
   /* store the result */
   *pResult = result;
 
-  /* return true if number and no extra non-whitespace chracters after */
+  /* return true if number and no extra non-whitespace characters after */
   return z>=zEnd && nDigits>0 && eValid;
 #else
   return !sqlite3Atoi64(z, pResult, length, enc);
@@ -23962,7 +23962,7 @@ static int os2Delete(
 }
 
 /*
-** Check the existance and status of a file.
+** Check the existence and status of a file.
 */
 static int os2Access(
   sqlite3_vfs *pVfs,        /* Not used on os2 */
@@ -26315,7 +26315,7 @@ static int nolockClose(sqlite3_file *id) {
 /******************************************************************************
 ************************* Begin dot-file Locking ******************************
 **
-** The dotfile locking implementation uses the existance of separate lock
+** The dotfile locking implementation uses the existence of separate lock
 ** files in order to control access to the database.  This works on just
 ** about every filesystem imaginable.  But there are serious downsides:
 **
@@ -26330,7 +26330,7 @@ static int nolockClose(sqlite3_file *id) {
 **
 ** Dotfile locking works by creating a file in the same directory as the
 ** database and with the same name but with a ".lock" extension added.
-** The existance of a lock file implies an EXCLUSIVE lock.  All other lock
+** The existence of a lock file implies an EXCLUSIVE lock.  All other lock
 ** types (SHARED, RESERVED, PENDING) are mapped into EXCLUSIVE.
 */
 
@@ -29637,7 +29637,7 @@ static int unixDelete(
 }
 
 /*
-** Test the existance of or access permissions of file zPath. The
+** Test the existence of or access permissions of file zPath. The
 ** test performed depends on the value of flags:
 **
 **     SQLITE_ACCESS_EXISTS: Return 1 if the file exists
@@ -30074,7 +30074,7 @@ static int unixGetLastError(sqlite3_vfs *NotUsed, int NotUsed2, char *NotUsed3){
 ** setting the environment variable SQLITE_FORCE_PROXY_LOCKING to 1 will
 ** force proxy locking to be used for every database file opened, and 0
 ** will force automatic proxy locking to be disabled for all database
-** files (explicity calling the SQLITE_SET_LOCKPROXYFILE pragma or
+** files (explicitly calling the SQLITE_SET_LOCKPROXYFILE pragma or
 ** sqlite_file_control API is not affected by SQLITE_FORCE_PROXY_LOCKING).
 */
 
@@ -33788,7 +33788,7 @@ static int winDelete(
 }
 
 /*
-** Check the existance and status of a file.
+** Check the existence and status of a file.
 */
 static int winAccess(
   sqlite3_vfs *pVfs,         /* Not used on win32 */
@@ -34345,7 +34345,7 @@ SQLITE_API int sqlite3_os_end(void){
 /*
 ** A bitmap is an instance of the following structure.
 **
-** This bitmap records the existance of zero or more bits
+** This bitmap records the existence of zero or more bits
 ** with values between 1 and iSize, inclusive.
 **
 ** There are three possible representations of the bitmap.
@@ -35828,7 +35828,7 @@ static sqlite3_pcache *pcache1Create(int szPage, int bPurgeable){
   int sz;               /* Bytes of memory required to allocate the new cache */
 
   /*
-  ** The seperateCache variable is true if each PCache has its own private
+  ** The separateCache variable is true if each PCache has its own private
   ** PGroup.  In other words, separateCache is true for mode (1) where no
   ** mutexing is required.
   **
@@ -41734,7 +41734,7 @@ static void pagerUnlockIfUnused(Pager *pPager){
 ** page is initialized to all zeros. 
 **
 ** If noContent is true, it means that we do not care about the contents
-** of the page. This occurs in two seperate scenarios:
+** of the page. This occurs in two separate scenarios:
 **
 **   a) When reading a free-list leaf page from the database, and
 **
@@ -44929,7 +44929,7 @@ SQLITE_PRIVATE int sqlite3WalOpen(
 }
 
 /*
-** Change the size to which the WAL file is trucated on each reset.
+** Change the size to which the WAL file is truncated on each reset.
 */
 SQLITE_PRIVATE void sqlite3WalLimit(Wal *pWal, i64 iLimit){
   if( pWal ) pWal->mxWalSize = iLimit;
@@ -48700,7 +48700,7 @@ static int allocateSpace(MemPage *pPage, int nByte, int *pIdx){
   }else if( gap+2<=top ){
     /* Search the freelist looking for a free slot big enough to satisfy 
     ** the request. The allocation is made from the first free slot in 
-    ** the list that is large enough to accomadate it.
+    ** the list that is large enough to accommodate it.
     */
     int pc, addr;
     for(addr=hdr+1; (pc = get2byte(&data[addr]))>0; addr=pc){
@@ -50520,7 +50520,7 @@ SQLITE_PRIVATE int sqlite3BtreeIncrVacuum(Btree *p){
 
 /*
 ** This routine is called prior to sqlite3PagerCommit when a transaction
-** is commited for an auto-vacuum database.
+** is committed for an auto-vacuum database.
 **
 ** If SQLITE_OK is returned, then *pnTrunc is set to the number of pages
 ** the database file should be truncated to during the commit process. 
@@ -52264,7 +52264,7 @@ SQLITE_PRIVATE int sqlite3BtreePrevious(BtCursor *pCur, int *pRes){
 ** which in turn can make database access faster.
 **
 ** If the "exact" parameter is not 0, and the page-number nearby exists 
-** anywhere on the free-list, then it is guarenteed to be returned. This
+** anywhere on the free-list, then it is guaranteed to be returned. This
 ** is only used by auto-vacuum databases when allocating a new table.
 */
 static int allocateBtreePage(
@@ -58372,7 +58372,7 @@ SQLITE_PRIVATE void sqlite3VdbeNoopComment(Vdbe *p, const char *zFormat, ...){
 ** by running with Valgrind.
 **
 ** About the #ifdef SQLITE_OMIT_TRACE:  Normally, this routine is never called
-** unless p->nOp>0.  This is because in the absense of SQLITE_OMIT_TRACE,
+** unless p->nOp>0.  This is because in the absence of SQLITE_OMIT_TRACE,
 ** an OP_Trace instruction is always inserted by sqlite3VdbeGet() as soon as
 ** a new VDBE is created.  So we are free to set addr to p->nOp-1 without
 ** having to double-check to make sure that the result is non-negative. But
@@ -59355,7 +59355,7 @@ static int vdbeCommit(sqlite3 *db, Vdbe *p){
 
   /* The complex case - There is a multi-file write-transaction active.
   ** This requires a master journal file to ensure the transaction is
-  ** committed atomicly.
+  ** committed atomically.
   */
 #ifndef SQLITE_OMIT_DISKIO
   else{
@@ -59551,7 +59551,7 @@ static void invalidateCursorsOnModifiedBtrees(sqlite3 *db){
 ** close it now. Argument eOp must be either SAVEPOINT_ROLLBACK or
 ** SAVEPOINT_RELEASE. If it is SAVEPOINT_ROLLBACK, then the statement
 ** transaction is rolled back. If eOp is SAVEPOINT_RELEASE, then the 
-** statement transaction is commtted.
+** statement transaction is committed.
 **
 ** If an IO error occurs, an SQLITE_IOERR_XXX error code is returned. 
 ** Otherwise SQLITE_OK.
@@ -60076,7 +60076,7 @@ SQLITE_PRIVATE int sqlite3VdbeCursorMoveto(VdbeCursor *p){
 ** the blob of data that it corresponds to. In a table record, all serial
 ** types are stored at the start of the record, and the blobs of data at
 ** the end. Hence these functions allow the caller to handle the
-** serial-type and data blob seperately.
+** serial-type and data blob separately.
 **
 ** The following table describes the various storage classes for data:
 **
@@ -61383,7 +61383,7 @@ SQLITE_API void *sqlite3_aggregate_context(sqlite3_context *p, int nByte){
 }
 
 /*
-** Return the auxilary data pointer, if any, for the iArg'th argument to
+** Return the auxiliary data pointer, if any, for the iArg'th argument to
 ** the user-function defined by pCtx.
 */
 SQLITE_API void *sqlite3_get_auxdata(sqlite3_context *pCtx, int iArg){
@@ -61398,7 +61398,7 @@ SQLITE_API void *sqlite3_get_auxdata(sqlite3_context *pCtx, int iArg){
 }
 
 /*
-** Set the auxilary data pointer and delete function, for the iArg'th
+** Set the auxiliary data pointer and delete function, for the iArg'th
 ** argument to the user-function defined by pCtx. Any previous value is
 ** deleted by calling the delete function specified when it was set.
 */
@@ -63408,7 +63408,7 @@ SQLITE_PRIVATE int sqlite3VdbeExec(
     }
 #endif
 
-    /* On any opcode with the "out2-prerelase" tag, free any
+    /* On any opcode with the "out2-prerelease" tag, free any
     ** external allocations out of mem[p2] and set mem[p2] to be
     ** an undefined integer.  Opcodes will either fill in the integer
     ** value or convert mem[p2] to a different type.
@@ -65590,7 +65590,7 @@ case OP_AutoCommit: {
 ** other process can start another write transaction while this transaction is
 ** underway.  Starting a write transaction also creates a rollback journal. A
 ** write transaction must be started before any changes can be made to the
-** database.  If P2 is 2 or greater then an EXCLUSIVE lock is also obtained
+** database.  If P2 is 2 or greater than an EXCLUSIVE lock is also obtained
 ** on the file.
 **
 ** If a write-transaction is started and the Vdbe.usesStmtJournal flag is
@@ -69899,7 +69899,7 @@ SQLITE_PRIVATE int sqlite3MemJournalSize(void){
 
 /*
 ** Walk an expression tree.  Invoke the callback once for each node
-** of the expression, while decending.  (In other words, the callback
+** of the expression, while descending.  (In other words, the callback
 ** is invoked before visiting children.)
 **
 ** The return value from the callback should be one of the WRC_*
@@ -70936,7 +70936,7 @@ static int resolveOrderGroupBy(
 }
 
 /*
-** Resolve names in the SELECT statement p and all of its descendents.
+** Resolve names in the SELECT statement p and all of its descendants.
 */
 static int resolveSelectStep(Walker *pWalker, Select *p){
   NameContext *pOuterNC;  /* Context that contains this SELECT */
@@ -71244,7 +71244,7 @@ SQLITE_PRIVATE void sqlite3ResolveSelectNames(
 ** affinity of that column is returned. Otherwise, 0x00 is returned,
 ** indicating no affinity for the expression.
 **
-** i.e. the WHERE clause expresssions in the following statements all
+** i.e. the WHERE clause expressions in the following statements all
 ** have an affinity:
 **
 ** CREATE TABLE t1(a);
@@ -72784,7 +72784,7 @@ SQLITE_PRIVATE int sqlite3FindInIndex(Parse *pParse, Expr *pX, int *prNotFound){
 **
 ** If rMayHaveNull is zero, that means that the subquery is being used
 ** for membership testing only.  There is no need to initialize any
-** registers to indicate the presense or absence of NULLs on the RHS.
+** registers to indicate the presence or absence of NULLs on the RHS.
 **
 ** For a SELECT or EXISTS operator, return the register that holds the
 ** result.  For IN operators or if an error occurs, the return value is 0.
@@ -74260,13 +74260,13 @@ static int evalConstExpr(Walker *pWalker, Expr *pExpr){
 
 /*
 ** Preevaluate constant subexpressions within pExpr and store the
-** results in registers.  Modify pExpr so that the constant subexpresions
+** results in registers.  Modify pExpr so that the constant subexpressions
 ** are TK_REGISTER opcodes that refer to the precomputed values.
 **
 ** This routine is a no-op if the jump to the cookie-check code has
 ** already occur.  Since the cookie-check jump is generated prior to
 ** any other serious processing, this check ensures that there is no
-** way to accidently bypass the constant initializations.
+** way to accidentally bypass the constant initializations.
 **
 ** This routine is also a no-op if the SQLITE_FactorOutConst optimization
 ** is disabled via the sqlite3_test_control(SQLITE_TESTCTRL_OPTIMIZATIONS)
@@ -74392,7 +74392,7 @@ SQLITE_PRIVATE void sqlite3ExprIfTrue(Parse *pParse, Expr *pExpr, int dest, int
   int r1, r2;
 
   assert( jumpIfNull==SQLITE_JUMPIFNULL || jumpIfNull==0 );
-  if( NEVER(v==0) )     return;  /* Existance of VDBE checked by caller */
+  if( NEVER(v==0) )     return;  /* Existence of VDBE checked by caller */
   if( NEVER(pExpr==0) ) return;  /* No way this can happen */
   op = pExpr->op;
   switch( op ){
@@ -74512,7 +74512,7 @@ SQLITE_PRIVATE void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int
   int r1, r2;
 
   assert( jumpIfNull==SQLITE_JUMPIFNULL || jumpIfNull==0 );
-  if( NEVER(v==0) ) return; /* Existance of VDBE checked by caller */
+  if( NEVER(v==0) ) return; /* Existence of VDBE checked by caller */
   if( pExpr==0 )    return;
 
   /* The value of pExpr->op and op are related as follows:
@@ -75132,7 +75132,7 @@ static void renameParentFunc(
 ** ALTER TABLE command. The first argument is the text of a CREATE TRIGGER 
 ** statement. The second is a table name. The table name in the CREATE 
 ** TRIGGER statement is replaced with the third argument and the result 
-** returned. This is analagous to renameTableFunc() above, except for CREATE
+** returned. This is analogous to renameTableFunc() above, except for CREATE
 ** TRIGGER, not CREATE INDEX and CREATE TABLE.
 */
 static void renameTriggerFunc(
@@ -79452,7 +79452,7 @@ SQLITE_PRIVATE void sqlite3DropTable(Parse *pParse, SrcList *pName, int isView,
     /* Drop all SQLITE_MASTER table and index entries that refer to the
     ** table. The program name loops through the master table and deletes
     ** every row that refers to a table of the same name as the one being
-    ** dropped. Triggers are handled seperately because a trigger can be
+    ** dropped. Triggers are handled separately because a trigger can be
     ** created in the temp database that refers to a table in another
     ** database.
     */
@@ -82374,7 +82374,7 @@ static void absFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
 **
 ** If p1 is negative, then we begin abs(p1) from the end of x[].
 **
-** If p2 is negative, return the p2 characters preceeding p1.
+** If p2 is negative, return the p2 characters preceding p1.
 */
 static void substrFunc(
   sqlite3_context *context,
@@ -83172,7 +83172,7 @@ static void zeroblobFunc(
 /*
 ** The replace() function.  Three arguments are all strings: call
 ** them A, B, and C. The result is also a string which is derived
-** from A by replacing every occurance of B with C.  The match
+** from A by replacing every occurrence of B with C.  The match
 ** must be exact.  Collating sequences are not used.
 */
 static void replaceFunc(
@@ -86752,7 +86752,7 @@ static int xferOptimization(
   }
 #endif
 #ifndef SQLITE_OMIT_FOREIGN_KEY
-  /* Disallow the transfer optimization if the destination table constains
+  /* Disallow the transfer optimization if the destination table constrains
   ** any foreign key constraints.  This is more restrictive than necessary.
   ** But the main beneficiary of the transfer optimization is the VACUUM 
   ** command, and the VACUUM command disables foreign key constraints.  So
@@ -90574,7 +90574,7 @@ SQLITE_PRIVATE void sqlite3SelectDelete(sqlite3 *db, Select *p){
 }
 
 /*
-** Given 1 to 3 identifiers preceeding the JOIN keyword, determine the
+** Given 1 to 3 identifiers preceding the JOIN keyword, determine the
 ** type of join.  Return an integer constant that expresses that type
 ** in terms of the following bit values:
 **
@@ -91892,7 +91892,7 @@ static void computeLimitRegisters(Parse *pParse, Select *p, int iBreak){
 
   /* 
   ** "LIMIT -1" always shows all rows.  There is some
-  ** contraversy about what the correct behavior should be.
+  ** controversy about what the correct behavior should be.
   ** The current implementation interprets "LIMIT 0" to mean
   ** no rows.
   */
@@ -93175,7 +93175,7 @@ static int flattenSubquery(
   pSubSrc = pSub->pSrc;
   assert( pSubSrc );
   /* Prior to version 3.1.2, when LIMIT and OFFSET had to be simple constants,
-  ** not arbitrary expresssions, we allowed some combining of LIMIT and OFFSET
+  ** not arbitrary expressions, we allowed some combining of LIMIT and OFFSET
   ** because they could be computed at compile-time.  But when LIMIT and OFFSET
   ** became arbitrary expressions, we were forced to add restrictions (13)
   ** and (14). */
@@ -93544,7 +93544,7 @@ static u8 minMaxQuery(Select *p){
 
 /*
 ** The select statement passed as the first argument is an aggregate query.
-** The second argment is the associated aggregate-info object. This 
+** The second argument is the associated aggregate-info object. This 
 ** function tests if the SELECT is of the form:
 **
 **   SELECT count(*) FROM <tbl>
@@ -93617,7 +93617,7 @@ SQLITE_PRIVATE int sqlite3IndexedByLookup(Parse *pParse, struct SrcList_item *pF
 **         without worrying about messing up the presistent representation
 **         of the view.
 **
-**    (3)  Add terms to the WHERE clause to accomodate the NATURAL keyword
+**    (3)  Add terms to the WHERE clause to accommodate the NATURAL keyword
 **         on joins and the ON and USING clause of joins.
 **
 **    (4)  Scan the list of columns in the result set (pEList) looking
@@ -94252,7 +94252,7 @@ SQLITE_PRIVATE int sqlite3Select(
     if( pSub==0 || pItem->isPopulated ) continue;
 
     /* Increment Parse.nHeight by the height of the largest expression
-    ** tree refered to by this, the parent select. The child select
+    ** tree referred to by this, the parent select. The child select
     ** may contain expression trees of at most
     ** (SQLITE_MAX_EXPR_DEPTH-Parse.nHeight) height. This is a bit
     ** more conservative than necessary, but much easier than enforcing
@@ -94472,7 +94472,7 @@ SQLITE_PRIVATE int sqlite3Select(
     */
     if( pGroupBy ){
       KeyInfo *pKeyInfo;  /* Keying information for the group by clause */
-      int j1;             /* A-vs-B comparision jump */
+      int j1;             /* A-vs-B comparison jump */
       int addrOutputRow;  /* Start of subroutine that outputs a result row */
       int regOutputRow;   /* Return address register for output subroutine */
       int addrSetAbort;   /* Set the abort flag and return */
@@ -96115,7 +96115,7 @@ SQLITE_PRIVATE void sqlite3CodeRowTriggerDirect(
 /*
 ** This is called to code the required FOR EACH ROW triggers for an operation
 ** on table pTab. The operation to code triggers for (INSERT, UPDATE or DELETE)
-** is given by the op paramater. The tr_tm parameter determines whether the
+** is given by the op parameter. The tr_tm parameter determines whether the
 ** BEFORE or AFTER triggers are coded. If the operation is an UPDATE, then
 ** parameter pChanges is passed the list of columns being modified.
 **
@@ -99313,7 +99313,7 @@ static void exprAnalyzeOrTerm(
         }
         if( (chngToIN & getMask(pMaskSet, pOrTerm->leftCursor))==0 ){
           /* This term must be of the form t1.a==t2.b where t2 is in the
-          ** chngToIN set but t1 is not.  This term will be either preceeded
+          ** chngToIN set but t1 is not.  This term will be either preceded
           ** or follwed by an inverted copy (t2.b==t1.a).  Skip this term 
           ** and use its inversion. */
           testcase( pOrTerm->wtFlags & TERM_COPIED );
@@ -102953,7 +102953,7 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
         **   (1) The table must not depend on other tables that have not
         **       yet run.
         **
-        **   (2) A full-table-scan plan cannot supercede indexed plan unless
+        **   (2) A full-table-scan plan cannot supersede indexed plan unless
         **       the full-table-scan is an "optimal" plan as defined above.
         **
         **   (3) All tables have an INDEXED BY clause or this table lacks an
@@ -107619,7 +107619,7 @@ SQLITE_PRIVATE const char sqlite3IsEbcdicIdChar[];
 **                 a statement.
 **
 **   (4) CREATE    The keyword CREATE has been seen at the beginning of a
-**                 statement, possibly preceeded by EXPLAIN and/or followed by
+**                 statement, possibly preceded by EXPLAIN and/or followed by
 **                 TEMP or TEMPORARY
 **
 **   (5) TRIGGER   We are in the middle of a trigger definition that must be
@@ -108525,7 +108525,7 @@ static int binCollFunc(
 /*
 ** Another built-in collating sequence: NOCASE. 
 **
-** This collating sequence is intended to be used for "case independant
+** This collating sequence is intended to be used for "case independent
 ** comparison". SQLite's knowledge of upper and lower case equivalents
 ** extends only to the 26 characters used in the English language.
 **
@@ -116368,7 +116368,7 @@ SQLITE_PRIVATE int sqlite3Fts3EvalPhraseStats(
 ** of the current row. 
 **
 ** More specifically, the returned buffer contains 1 varint for each 
-** occurence of the phrase in the column, stored using the normal (delta+2) 
+** occurrence of the phrase in the column, stored using the normal (delta+2) 
 ** compression and is terminated by either an 0x01 or 0x00 byte. For example,
 ** if the requested column contains "a b X c d X X" and the position-list
 ** for 'X' is requested, the buffer returned may contain:
@@ -118508,7 +118508,7 @@ static int star_oh(const char *z){
 
 /*
 ** If the word ends with zFrom and xCond() is true for the stem
-** of the word that preceeds the zFrom ending, then change the 
+** of the word that precede the zFrom ending, then change the 
 ** ending to zTo.
 **
 ** The input word *pz and zFrom are both in reverse order.  zTo
@@ -123270,9 +123270,9 @@ static int fts3SnippetFindPositions(Fts3Expr *pExpr, int iPhrase, void *ctx){
 ** is the snippet with the highest score, where scores are calculated
 ** by adding:
 **
-**   (a) +1 point for each occurence of a matchable phrase in the snippet.
+**   (a) +1 point for each occurrence of a matchable phrase in the snippet.
 **
-**   (b) +1000 points for the first occurence of each matchable phrase in 
+**   (b) +1000 points for the first occurrence of each matchable phrase in 
 **       the snippet for which the corresponding mCovered bit is not set.
 **
 ** The selected snippet parameters are stored in structure *pFragment before
@@ -123373,7 +123373,7 @@ static int fts3StringAppend(
   }
 
   /* If there is insufficient space allocated at StrBuffer.z, use realloc()
-  ** to grow the buffer until so that it is big enough to accomadate the
+  ** to grow the buffer until so that it is big enough to accommodate the
   ** appended data.
   */
   if( pStr->n+nAppend+1>=pStr->nAlloc ){
@@ -127688,7 +127688,7 @@ SQLITE_API int sqlite3_extension_init(
 **   * Implementations of the SQL scalar upper() and lower() functions
 **     for case mapping.
 **
-**   * Integration of ICU and SQLite collation seqences.
+**   * Integration of ICU and SQLite collation sequences.
 **
 **   * An implementation of the LIKE operator that uses ICU to 
 **     provide case-independent matching.
diff --git a/ext/sqlite3/php_sqlite3_structs.h b/ext/sqlite3/php_sqlite3_structs.h
index 0e813b6df..6c65e02ee 100644
--- a/ext/sqlite3/php_sqlite3_structs.h
+++ b/ext/sqlite3/php_sqlite3_structs.h
@@ -23,7 +23,7 @@
 
 #include <sqlite3.h>
 
-/* for backwards compatability reasons */
+/* for backwards compatibility reasons */
 #ifndef SQLITE_OPEN_READONLY
 #define SQLITE_OPEN_READONLY 0x00000001
 #endif
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
index df449d738..2aef0414a 100644
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@ -1409,7 +1409,7 @@ static int register_bound_parameter_to_sqlite(struct php_sqlite3_bound_param *pa
 /* }}} */
 
 /* {{{ proto bool SQLite3Stmt::bindParam(int parameter_number, mixed parameter [, int type])
-   Bind Paramater to a stmt variable. */
+   Bind Parameter to a stmt variable. */
 PHP_METHOD(sqlite3stmt, bindParam)
 {
 	php_sqlite3_stmt *stmt_obj;
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 40a27c053..1deacc715 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -352,7 +352,7 @@ PHP_FUNCTION(count)
 
 /* Numbers are always smaller than strings int this function as it
  * anyway doesn't make much sense to compare two different data types.
- * This keeps it consistant and simple.
+ * This keeps it consistent and simple.
  *
  * This is not correct any more, depends on what compare_func is set to.
  */
@@ -1053,7 +1053,7 @@ PHP_FUNCTION(max)
 static int php_array_walk(HashTable *target_hash, zval *userdata, int recursive TSRMLS_DC) /* {{{ */
 {
 	zval **args[3],			/* Arguments to userland function */
-		  *retval_ptr,		/* Return value - unused */
+		  *retval_ptr = NULL,		/* Return value - unused */
 		  *key=NULL;		/* Entry key */
 	char  *string_key;
 	uint   string_key_len;
@@ -2877,7 +2877,7 @@ static int zval_compare(zval **a, zval **b TSRMLS_DC) /* {{{ */
 static int zval_user_compare(zval **a, zval **b TSRMLS_DC) /* {{{ */
 {
 	zval **args[2];
-	zval *retval_ptr;
+	zval *retval_ptr = NULL;
 
 	args[0] = (zval **) a;
 	args[1] = (zval **) b;
@@ -2996,8 +2996,8 @@ static void php_array_intersect(INTERNAL_FUNCTION_PARAMETERS, int behavior, int
 	char *param_spec;
 	zend_fcall_info fci1, fci2;
 	zend_fcall_info_cache fci1_cache = empty_fcall_info_cache, fci2_cache = empty_fcall_info_cache;
-	zend_fcall_info *fci_key, *fci_data;
-	zend_fcall_info_cache *fci_key_cache, *fci_data_cache;
+	zend_fcall_info *fci_key = NULL, *fci_data;
+	zend_fcall_info_cache *fci_key_cache = NULL, *fci_data_cache;
 	PHP_ARRAY_CMP_FUNC_VARS;
 
 	int (*intersect_key_compare_func)(const void *, const void * TSRMLS_DC);
@@ -3414,8 +3414,8 @@ static void php_array_diff(INTERNAL_FUNCTION_PARAMETERS, int behavior, int data_
 	char *param_spec;
 	zend_fcall_info fci1, fci2;
 	zend_fcall_info_cache fci1_cache = empty_fcall_info_cache, fci2_cache = empty_fcall_info_cache;
-	zend_fcall_info *fci_key, *fci_data;
-	zend_fcall_info_cache *fci_key_cache, *fci_data_cache;
+	zend_fcall_info *fci_key = NULL, *fci_data;
+	zend_fcall_info_cache *fci_key_cache = NULL, *fci_data_cache;
 	PHP_ARRAY_CMP_FUNC_VARS;
 
 	int (*diff_key_compare_func)(const void *, const void * TSRMLS_DC);
@@ -4019,7 +4019,6 @@ PHP_FUNCTION(array_sum)
 		 **entry,
 		 entry_n;
 	HashPosition pos;
-	double dval;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &input) == FAILURE) {
 		return;
@@ -4037,17 +4036,7 @@ PHP_FUNCTION(array_sum)
 		entry_n = **entry;
 		zval_copy_ctor(&entry_n);
 		convert_scalar_to_number(&entry_n TSRMLS_CC);
-
-		if (Z_TYPE(entry_n) == IS_LONG && Z_TYPE_P(return_value) == IS_LONG) {
-			dval = (double)Z_LVAL_P(return_value) + (double)Z_LVAL(entry_n);
-			if ( (double)LONG_MIN <= dval && dval <= (double)LONG_MAX ) {
-				Z_LVAL_P(return_value) += Z_LVAL(entry_n);
-				continue;
-			}
-		}
-		convert_to_double(return_value);
-		convert_to_double(&entry_n);
-		Z_DVAL_P(return_value) += Z_DVAL(entry_n);
+		fast_add_function(return_value, return_value, &entry_n TSRMLS_CC);
 	}
 }
 /* }}} */
diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index 1e1252f60..ed773b851 100644
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -451,6 +451,19 @@ static int browser_reg_compare(zval **browser TSRMLS_DC, int num_args, va_list a
 }
 /* }}} */
 
+static void browscap_zval_copy_ctor(zval **p) /* {{{ */
+{
+	zval *new;
+
+	ALLOC_ZVAL(new);
+	*new = **p;
+
+	zval_copy_ctor(new);
+
+	INIT_PZVAL(new);
+	*p = new;
+} /* }}} */
+
 /* {{{ proto mixed get_browser([string browser_name [, bool return_array]])
    Get information about the capabilities of a browser. If browser_name is omitted or null, HTTP_USER_AGENT is used. Returns an object by default; if return_array is true, returns an array. */
 PHP_FUNCTION(get_browser)
@@ -511,11 +524,11 @@ PHP_FUNCTION(get_browser)
 
 	if (return_array) {
 		array_init(return_value);
-		zend_hash_copy(Z_ARRVAL_P(return_value), Z_ARRVAL_PP(agent), (copy_ctor_func_t) zval_add_ref, (void *) &tmp_copy, sizeof(zval *));
+		zend_hash_copy(Z_ARRVAL_P(return_value), Z_ARRVAL_PP(agent), (copy_ctor_func_t) browscap_zval_copy_ctor, (void *) &tmp_copy, sizeof(zval *));
 	}
 	else {
 		object_init(return_value);
-		zend_hash_copy(Z_OBJPROP_P(return_value), Z_ARRVAL_PP(agent), (copy_ctor_func_t) zval_add_ref, (void *) &tmp_copy, sizeof(zval *));
+		zend_hash_copy(Z_OBJPROP_P(return_value), Z_ARRVAL_PP(agent), (copy_ctor_func_t) browscap_zval_copy_ctor, (void *) &tmp_copy, sizeof(zval *));
 	}
 
 	while (zend_hash_find(Z_ARRVAL_PP(agent), "parent", sizeof("parent"), (void **) &z_agent_name) == SUCCESS) {
@@ -524,10 +537,10 @@ PHP_FUNCTION(get_browser)
 		}
 
 		if (return_array) {
-			zend_hash_merge(Z_ARRVAL_P(return_value), Z_ARRVAL_PP(agent), (copy_ctor_func_t) zval_add_ref, (void *) &tmp_copy, sizeof(zval *), 0);
+			zend_hash_merge(Z_ARRVAL_P(return_value), Z_ARRVAL_PP(agent), (copy_ctor_func_t) browscap_zval_copy_ctor, (void *) &tmp_copy, sizeof(zval *), 0);
 		}
 		else {
-			zend_hash_merge(Z_OBJPROP_P(return_value), Z_ARRVAL_PP(agent), (copy_ctor_func_t) zval_add_ref, (void *) &tmp_copy, sizeof(zval *), 0);
+			zend_hash_merge(Z_OBJPROP_P(return_value), Z_ARRVAL_PP(agent), (copy_ctor_func_t) browscap_zval_copy_ctor, (void *) &tmp_copy, sizeof(zval *), 0);
 		}
 	}
 
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index c33ae1e05..c1f5aff7c 100644
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -358,7 +358,29 @@ else
   AC_MSG_RESULT(no)
 fi
 
-if test "$PHP_SAPI" = "cgi" || test "$PHP_SAPI" = "cli" || test "$PHP_SAPI" = "embed"; then
+PHP_ENABLE_CHROOT_FUNC=no
+case "$PHP_SAPI" in
+  embed)
+    PHP_ENABLE_CHROOT_FUNC=yes
+  ;;
+
+  none)
+    for PROG in $PHP_BINARIES; do
+      case "$PROG" in
+        cgi|cli)
+          PHP_ENABLE_CHROOT_FUNC=yes
+        ;;
+
+        *)
+          PHP_ENABLE_CHROOT_FUNC=no
+          break
+        ;;
+      esac
+   done
+  ;;
+esac
+
+if test "$PHP_ENABLE_CHROOT_FUNC" = "yes"; then
   AC_DEFINE(ENABLE_CHROOT_FUNC, 1, [Whether to enable chroot() function])
 fi
 
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index ce2987bfc..73be21d9a 100644
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -904,7 +904,7 @@ PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int typ
 	}
 
 	if (php_stream_stat_path_ex((char *)filename, flags, &ssb, NULL)) {
-		/* Error Occured */
+		/* Error Occurred */
 		if (!IS_EXISTS_CHECK(type)) {
 			php_error_docref(NULL TSRMLS_CC, E_WARNING, "%sstat failed for %s", IS_LINK_OPERATION(type) ? "L" : "", filename);
 		}
diff --git a/ext/standard/filters.c b/ext/standard/filters.c
index 084860c76..15dae1bee 100644
--- a/ext/standard/filters.c
+++ b/ext/standard/filters.c
@@ -771,7 +771,7 @@ static void php_conv_qprint_encode_dtor(php_conv_qprint_encode *inst)
 }
 
 #define NEXT_CHAR(ps, icnt, lb_ptr, lb_cnt, lbchars) \
-	((lb_ptr) < (lb_cnt) ? (lbchars)[(lb_ptr)] : *(ps)) 
+	((lb_ptr) < (lb_cnt) ? (lbchars)[(lb_ptr)] : *(ps))
 
 #define CONSUME_CHAR(ps, icnt, lb_ptr, lb_cnt) \
 	if ((lb_ptr) < (lb_cnt)) { \
@@ -791,6 +791,7 @@ static php_conv_err_t php_conv_qprint_encode_convert(php_conv_qprint_encode *ins
 	unsigned int line_ccnt;
 	unsigned int lb_ptr;
 	unsigned int lb_cnt;
+	unsigned int trail_ws;
 	int opts;
 	static char qp_digits[] = "0123456789ABCDEF";
 
@@ -807,6 +808,7 @@ static php_conv_err_t php_conv_qprint_encode_convert(php_conv_qprint_encode *ins
 	icnt = *in_left_p;
 	pd = (unsigned char *)(*out_pp);
 	ocnt = *out_left_p;
+	trail_ws = 0;
 
 	for (;;) {
 		if (!(opts & PHP_CONV_QPRINT_OPT_BINARY) && inst->lbchars != NULL && inst->lbchars_len > 0) {
@@ -839,11 +841,13 @@ static php_conv_err_t php_conv_qprint_encode_convert(php_conv_qprint_encode *ins
 
 		if (lb_ptr >= lb_cnt && icnt <= 0) {
 			break;
-		} 
+		}
 
 		c = NEXT_CHAR(ps, icnt, lb_ptr, lb_cnt, inst->lbchars);
 
-		if (!(opts & PHP_CONV_QPRINT_OPT_BINARY) && (c == '\t' || c == ' ')) {
+		if (!(opts & PHP_CONV_QPRINT_OPT_BINARY) &&
+			(trail_ws == 0) &&
+			(c == '\t' || c == ' ')) {
 			if (line_ccnt < 2 && inst->lbchars != NULL) {
 				if (ocnt < inst->lbchars_len + 1) {
 					err = PHP_CONV_ERR_TOO_BIG;
@@ -863,12 +867,44 @@ static php_conv_err_t php_conv_qprint_encode_convert(php_conv_qprint_encode *ins
 					err = PHP_CONV_ERR_TOO_BIG;
 					break;
 				}
-				*(pd++) = c;
-				ocnt--;
-				line_ccnt--;
-				CONSUME_CHAR(ps, icnt, lb_ptr, lb_cnt);
+
+				/* Check to see if this is EOL whitespace. */
+				if (inst->lbchars != NULL) {
+					unsigned char *ps2;
+					unsigned int j, lb_cnt2;
+
+					lb_cnt2 = 0;
+					ps2 = ps;
+					trail_ws = 1;
+
+					for (j = icnt - 1; j > 0; j--, ps2++) {
+						if (*ps2 == inst->lbchars[lb_cnt2]) {
+							lb_cnt2++;
+							if (lb_cnt2 >= inst->lbchars_len) {
+								/* Found trailing ws. Reset to top of main
+								 * for loop to allow for code to do necessary
+								 * wrapping/encoding. */
+								break;
+							}
+						} else if (lb_cnt2 != 0 || (*ps2 != '\t' && *ps2 != ' ')) {
+							/* At least one non-EOL character following, so
+							 * don't need to encode ws. */
+							trail_ws = 0;
+							break;
+						} else {
+							trail_ws++;
+						}
+					}
+				}
+
+				if (trail_ws == 0) {
+					*(pd++) = c;
+					ocnt--;
+					line_ccnt--;
+					CONSUME_CHAR(ps, icnt, lb_ptr, lb_cnt);
+				}
 			}
-		} else if ((!(opts & PHP_CONV_QPRINT_OPT_FORCE_ENCODE_FIRST) || line_ccnt < inst->line_len) && ((c >= 33 && c <= 60) || (c >= 62 && c <= 126))) { 
+		} else if ((!(opts & PHP_CONV_QPRINT_OPT_FORCE_ENCODE_FIRST) || line_ccnt < inst->line_len) && ((c >= 33 && c <= 60) || (c >= 62 && c <= 126))) {
 			if (line_ccnt < 2 && inst->lbchars != NULL) {
 				if (ocnt < inst->lbchars_len + 1) {
 					err = PHP_CONV_ERR_TOO_BIG;
@@ -912,9 +948,12 @@ static php_conv_err_t php_conv_qprint_encode_convert(php_conv_qprint_encode *ins
 			}
 			*(pd++) = '=';
 			*(pd++) = qp_digits[(c >> 4)];
-			*(pd++) = qp_digits[(c & 0x0f)]; 
+			*(pd++) = qp_digits[(c & 0x0f)];
 			ocnt -= 3;
 			line_ccnt -= 3;
+			if (trail_ws > 0) {
+				trail_ws--;
+			}
 			CONSUME_CHAR(ps, icnt, lb_ptr, lb_cnt);
 		}
 	}
@@ -922,7 +961,7 @@ static php_conv_err_t php_conv_qprint_encode_convert(php_conv_qprint_encode *ins
 	*in_pp = (const char *)ps;
 	*in_left_p = icnt;
 	*out_pp = (char *)pd;
-	*out_left_p = ocnt; 
+	*out_left_p = ocnt;
 	inst->line_ccnt = line_ccnt;
 	inst->lb_ptr = lb_ptr;
 	inst->lb_cnt = lb_cnt;
diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c
index 373293935..86975d7f5 100644
--- a/ext/standard/ftp_fopen_wrapper.c
+++ b/ext/standard/ftp_fopen_wrapper.c
@@ -440,7 +440,7 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, ch
 		if (strchr(mode, 'a')) {
 			read_write = 3; /* Open for Appending */
 		} else {
-			read_write = 2; /* Open for writting */
+			read_write = 2; /* Open for writing */
 		}
 	}
 	if (!read_write) {
@@ -500,7 +500,7 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, ch
 		}
 		if (result <= 299 && result >= 200) {
 			if (allow_overwrite) {
-				/* Context permits overwritting file, 
+				/* Context permits overwriting file, 
 				   so we just delete whatever's there in preparation */
 				php_stream_printf(stream TSRMLS_CC, "DELE %s\r\n", resource->path);
 				result = GET_FTP_RESULT(stream);
diff --git a/ext/standard/html.c b/ext/standard/html.c
index 414fa65c9..b4d9ba109 100644
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -1221,8 +1221,8 @@ PHPAPI char *php_escape_html_entities_ex(unsigned char *old, size_t oldlen, size
 	const enc_to_uni *to_uni_table = NULL;
 	const entity_ht *inv_map = NULL; /* used for !double_encode */
 	/* only used if flags includes ENT_HTML_IGNORE_ERRORS or ENT_HTML_SUBSTITUTE_DISALLOWED_CHARS */
-	const unsigned char *replacement;
-	size_t replacement_len;
+	const unsigned char *replacement = NULL;
+	size_t replacement_len = 0;
 
 	if (all) { /* replace with all named entities */
 		if (CHARSET_PARTIAL_SUPPORT(charset)) {
@@ -1596,7 +1596,7 @@ PHP_FUNCTION(get_html_translation_table)
 		 flags = ENT_COMPAT;
 	int doctype;
 	entity_table_opt entity_table;
-	const enc_to_uni *to_uni_table;
+	const enc_to_uni *to_uni_table = NULL;
 	char *charset_hint = NULL;
 	int charset_hint_len;
 	enum entity_charset charset;
diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c
index b8676bbba..4605e7494 100644
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -84,6 +84,30 @@
 #define HTTP_WRAPPER_HEADER_INIT    1
 #define HTTP_WRAPPER_REDIRECTED     2
 
+static inline void strip_header(char *header_bag, char *lc_header_bag,
+		const char *lc_header_name)
+{
+	char *lc_header_start = strstr(lc_header_bag, lc_header_name);
+	char *header_start = header_bag + (lc_header_start - lc_header_bag);
+
+	if (lc_header_start
+	&& (lc_header_start == lc_header_bag || *(lc_header_start-1) == '\n')
+	) {
+		char *lc_eol = strchr(lc_header_start, '\n');
+		char *eol = header_start + (lc_eol - lc_header_start);
+
+		if (lc_eol) {
+			size_t eollen = strlen(lc_eol);
+
+			memmove(lc_header_start, lc_eol+1, eollen);
+			memmove(header_start, eol+1, eollen);
+		} else {
+			*lc_header_start = '\0';
+			*header_start = '\0';
+		}
+	}
+}
+
 php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context, int redirect_max, int flags STREAMS_DC TSRMLS_DC) /* {{{ */
 {
 	php_stream *stream = NULL;
@@ -425,40 +449,17 @@ finish:
 		if (tmp && strlen(tmp) > 0) {
 			char *s;
 
-			if (!header_init) { /* Remove post headers for redirects */
-				int l = strlen(tmp);
-				char *s2, *tmp_c = estrdup(tmp);
-				
-				php_strtolower(tmp_c, l);
-				if ((s = strstr(tmp_c, "content-length:"))) {
-					if ((s2 = memchr(s, '\n', tmp_c + l - s))) {
-						int b = tmp_c + l - 1 - s2;
-						memmove(tmp, tmp + (s2 + 1 - tmp_c), b);
-						memmove(tmp_c, s2 + 1, b);
-						
-					} else {
-						tmp[s - tmp_c] = *s = '\0';
-					}
-					l = strlen(tmp_c);
-				}
-				if ((s = strstr(tmp_c, "content-type:"))) {
-					if ((s2 = memchr(s, '\n', tmp_c + l - s))) {
-						memmove(tmp, tmp + (s2 + 1 - tmp_c), tmp_c + l - 1 - s2);
-					} else {
-						tmp[s - tmp_c] = '\0';
-					}
-				}
-
-				efree(tmp_c);
-				tmp_c = php_trim(tmp, strlen(tmp), NULL, 0, NULL, 3 TSRMLS_CC);
-				efree(tmp);
-				tmp = tmp_c;
-			}
-
 			user_headers = estrdup(tmp);
 
 			/* Make lowercase for easy comparison against 'standard' headers */
 			php_strtolower(tmp, strlen(tmp));
+
+			if (!header_init) {
+				/* strip POST headers on redirect */
+				strip_header(user_headers, tmp, "content-length:");
+				strip_header(user_headers, tmp, "content-type:");
+			}
+
 			if ((s = strstr(tmp, "user-agent:")) && 
 			    (s == tmp || *(s-1) == '\r' || *(s-1) == '\n' || 
 			                 *(s-1) == '\t' || *(s-1) == ' ')) {
diff --git a/ext/standard/image.c b/ext/standard/image.c
index 4984e4064..bd80f11de 100644
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -112,7 +112,7 @@ static struct gfxinfo *php_handle_gif (php_stream * stream TSRMLS_DC)
 	result->width    = (unsigned int)dim[0] | (((unsigned int)dim[1])<<8);
 	result->height   = (unsigned int)dim[2] | (((unsigned int)dim[3])<<8);
 	result->bits     = dim[4]&0x80 ? ((((unsigned int)dim[4])&0x07) + 1) : 0;
-	result->channels = 3; /* allways */
+	result->channels = 3; /* always */
 
 	return result;
 }
@@ -606,7 +606,7 @@ static struct gfxinfo *php_handle_jpc(php_stream * stream TSRMLS_DC)
 
 	/* JPEG 2000 components can be vastly different from one another.
 	   Each component can be sampled at a different resolution, use
-	   a different colour space, have a seperate colour depth, and
+	   a different colour space, have a separate colour depth, and
 	   be compressed totally differently! This makes giving a single
 	   "bit depth" answer somewhat problematic. For this implementation
 	   we'll use the highest depth encountered. */
diff --git a/ext/standard/info.c b/ext/standard/info.c
index e171f72b5..cb2e46984 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -125,7 +125,11 @@ static void php_info_print_stream_hash(const char *name, HashTable *ht TSRMLS_DC
 			zend_hash_internal_pointer_reset_ex(ht, &pos);
 			while (zend_hash_get_current_key_ex(ht, &key, &len, NULL, 0, &pos) == HASH_KEY_IS_STRING)
 			{
-				php_info_print(key);
+				if (!sapi_module.phpinfo_as_text) {
+					php_info_print_html_esc(key, len-1);
+				} else {
+					php_info_print(key);
+				}
 				zend_hash_move_forward_ex(ht, &pos);
 				if (zend_hash_get_current_key_ex(ht, &key, &len, NULL, 0, &pos) == HASH_KEY_IS_STRING) {
 					php_info_print(", ");
@@ -291,7 +295,7 @@ void php_info_print_style(TSRMLS_D)
 PHPAPI char *php_info_html_esc(char *string TSRMLS_DC)
 {
 	size_t new_len;
-	return php_escape_html_entities(string, strlen(string), &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC);
+	return php_escape_html_entities((unsigned char *) string, strlen(string), &new_len, 0, ENT_QUOTES, NULL TSRMLS_CC);
 }
 /* }}} */
 
diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index 25766818f..b4f6a926c 100644
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -318,7 +318,7 @@ PHPAPI int php_mail(char *to, char *subject, char *message, char *headers, char
 	sendmail = popen_ex(sendmail_cmd, "wb", NULL, NULL TSRMLS_CC);
 #else
 	/* Since popen() doesn't indicate if the internal fork() doesn't work
-	 * (e.g. the shell can't be executed) we explicitely set it to 0 to be
+	 * (e.g. the shell can't be executed) we explicitly set it to 0 to be
 	 * sure we don't catch any older errno value. */
 	errno = 0;
 	sendmail = popen(sendmail_cmd, "w");
diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index 29419d211..eb80395f5 100644
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -69,7 +69,7 @@ char machine_little_endian;
 /* Mapping of byte from char (8bit) to long for machine endian */
 static int byte_map[1];
 
-/* Mappings of bytes from int (machine dependant) to int for machine endian */
+/* Mappings of bytes from int (machine dependent) to int for machine endian */
 static int int_map[sizeof(int)];
 
 /* Mappings of bytes from shorts (16bit) for all endian environments */
@@ -503,7 +503,7 @@ static long php_unpack(char *data, int size, int issigned, int *map)
 
 /* unpack() is based on Perl's unpack(), but is modified a bit from there.
  * Rather than depending on error-prone ordered lists or syntactically
- * unpleasant pass-by-reference, we return an object with named paramters 
+ * unpleasant pass-by-reference, we return an object with named parameters 
  * (like *_fetch_object()). Syntax is "f[repeat]name/...", where "f" is the
  * formatter char (like pack()), "[repeat]" is the optional repeater argument,
  * and "name" is the name of the variable to use.
diff --git a/ext/standard/php_var.h b/ext/standard/php_var.h
index 35343b3d5..afc5f178e 100644
--- a/ext/standard/php_var.h
+++ b/ext/standard/php_var.h
@@ -115,6 +115,7 @@ do { \
 
 PHPAPI void var_replace(php_unserialize_data_t *var_hash, zval *ozval, zval **nzval);
 PHPAPI void var_push_dtor(php_unserialize_data_t *var_hash, zval **val);
+PHPAPI void var_push_dtor_no_addref(php_unserialize_data_t *var_hashx, zval **rval);
 PHPAPI void var_destroy(php_unserialize_data_t *var_hash);
 
 #define PHP_VAR_UNSERIALIZE_ZVAL_CHANGED(var_hash, ozval, nzval) \
diff --git a/ext/standard/quot_print.c b/ext/standard/quot_print.c
index 28dcc63f1..0df127362 100644
--- a/ext/standard/quot_print.c
+++ b/ext/standard/quot_print.c
@@ -151,7 +151,7 @@ PHPAPI unsigned char *php_quot_print_encode(const unsigned char *str, size_t len
 	unsigned char c, *ret, *d;
 	char *hex = "0123456789ABCDEF";
 
-	ret = safe_emalloc(1, 3 * length + 3 * (((3 * length)/PHP_QPRINT_MAXL) + 1), 0);
+	ret = safe_emalloc(3, length + (((3 * length)/(PHP_QPRINT_MAXL-9)) + 1), 1);
 	d = ret;
 
 	while (length--) {
@@ -286,4 +286,4 @@ PHP_FUNCTION(quoted_printable_encode)
  * End:
  * vim600: sw=4 ts=4 fdm=marker
  * vim<600: sw=4 ts=4
- */
\ No newline at end of file
+ */
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index 21c55e404..f487763b9 100644
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@ -601,7 +601,6 @@ static int stream_array_to_fd_set(zval *stream_array, fd_set *fds, php_socket_t
 {
 	zval **elem;
 	php_stream *stream;
-	php_socket_t this_fd;
 	int cnt = 0;
 
 	if (Z_TYPE_P(stream_array) != IS_ARRAY) {
@@ -611,6 +610,11 @@ static int stream_array_to_fd_set(zval *stream_array, fd_set *fds, php_socket_t
 		 zend_hash_get_current_data(Z_ARRVAL_P(stream_array), (void **) &elem) == SUCCESS;
 		 zend_hash_move_forward(Z_ARRVAL_P(stream_array))) {
 
+		/* Temporary int fd is needed for the STREAM data type on windows, passing this_fd directly to php_stream_cast()
+			would eventually bring a wrong result on x64. php_stream_cast() casts to int internally, and this will leave
+			the higher bits of a SOCKET variable uninitialized on systems with little endian. */
+		int tmp_fd;
+
 		php_stream_from_zval_no_verify(stream, elem);
 		if (stream == NULL) {
 			continue;
@@ -620,7 +624,9 @@ static int stream_array_to_fd_set(zval *stream_array, fd_set *fds, php_socket_t
 		 * when casting.  It is only used here so that the buffered data warning
 		 * is not displayed.
 		 * */
-		if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&this_fd, 1) && this_fd != -1) {
+		if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&tmp_fd, 1) && tmp_fd != -1) {
+
+			php_socket_t this_fd = (php_socket_t)tmp_fd;
 
 			PHP_SAFE_FD_SET(this_fd, fds);
 
@@ -638,7 +644,6 @@ static int stream_array_from_fd_set(zval *stream_array, fd_set *fds TSRMLS_DC)
 	zval **elem, **dest_elem;
 	php_stream *stream;
 	HashTable *new_hash;
-	php_socket_t this_fd;
 	int ret = 0;
 
 	if (Z_TYPE_P(stream_array) != IS_ARRAY) {
@@ -655,6 +660,11 @@ static int stream_array_from_fd_set(zval *stream_array, fd_set *fds TSRMLS_DC)
 		char *key;
 		uint key_len;
 		ulong num_ind;
+		/* Temporary int fd is needed for the STREAM data type on windows, passing this_fd directly to php_stream_cast()
+			would eventually bring a wrong result on x64. php_stream_cast() casts to int internally, and this will leave
+			the higher bits of a SOCKET variable uninitialized on systems with little endian. */
+		int tmp_fd;
+
 
 		type = zend_hash_get_current_key_ex(Z_ARRVAL_P(stream_array),
 				&key, &key_len, &num_ind, 0, NULL);
@@ -672,7 +682,10 @@ static int stream_array_from_fd_set(zval *stream_array, fd_set *fds TSRMLS_DC)
 		 * when casting.  It is only used here so that the buffered data warning
 		 * is not displayed.
 		 */
-		if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&this_fd, 1) && this_fd != -1) {
+		if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&tmp_fd, 1) && tmp_fd != -1) {
+
+			php_socket_t this_fd = (php_socket_t)tmp_fd;
+
 			if (PHP_SAFE_FD_ISSET(this_fd, fds)) {
 				if (type == HASH_KEY_IS_LONG) {
 					zend_hash_index_update(new_hash, num_ind, (void *)elem, sizeof(zval *), (void **)&dest_elem);
@@ -1578,7 +1591,7 @@ PHP_FUNCTION(stream_is_local)
 /* }}} */
 
 /* {{{ proto bool stream_supports_lock(resource stream)
-   Tells wether the stream supports locking through flock(). */
+   Tells whether the stream supports locking through flock(). */
 PHP_FUNCTION(stream_supports_lock)
 {
 	php_stream *stream;
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 77e0dff4c..c744cb46f 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1581,7 +1581,7 @@ PHP_FUNCTION(pathinfo)
 		const char *p;
 		int idx;
 
-		/* Have we alrady looked up the basename? */
+		/* Have we already looked up the basename? */
 		if (!have_basename && !ret) {
 			php_basename(path, path_len, NULL, 0, &ret, &ret_len TSRMLS_CC);
 		}
@@ -3253,7 +3253,7 @@ static void php_similar_str(const char *txt1, int len1, const char *txt2, int le
 static int php_similar_char(const char *txt1, int len1, const char *txt2, int len2)
 {
 	int sum;
-	int pos1, pos2, max;
+	int pos1 = 0, pos2 = 0, max;
 
 	php_similar_str(txt1, len1, txt2, len2, &pos1, &pos2, &max);
 	if ((sum = max)) {
@@ -4613,7 +4613,7 @@ PHPAPI size_t php_strip_tags_ex(char *rbuf, int len, int *stateptr, char *allow,
 	char *tbuf, *buf, *p, *tp, *rp, c, lc;
 	int br, i=0, depth=0, in_q = 0;
 	int state = 0, pos;
-	char *allow_free;
+	char *allow_free = NULL;
 
 	if (stateptr)
 		state = *stateptr;
diff --git a/ext/standard/tests/array/009.phpt b/ext/standard/tests/array/009.phpt
index f88f8763f..7b3bba226 100644
--- a/ext/standard/tests/array/009.phpt
+++ b/ext/standard/tests/array/009.phpt
@@ -94,7 +94,7 @@ var_dump( current($temp_array, $temp_array) );
 var_dump( reset($temp_array, $temp_array) );
 var_dump( next($temp_array, $temp_array) );
 
-// invalid args type, valid arguement: array 
+// invalid args type, valid argument: array 
 $int_var = 1;
 $float_var = 1.5;
 $string = "string";
diff --git a/ext/standard/tests/array/array_combine_variation3.phpt b/ext/standard/tests/array/array_combine_variation3.phpt
index 03de63290..1381fe0f4 100644
--- a/ext/standard/tests/array/array_combine_variation3.phpt
+++ b/ext/standard/tests/array/array_combine_variation3.phpt
@@ -29,7 +29,7 @@ the lazy dog
 This is a double quoted string
 EOT;
 
-// heredoc with diferent whitespaces
+// heredoc with different whitespaces
 $diff_whitespaces = <<<EOT
 hello\r world\t
 1111\t\t != 2222\v\v
diff --git a/ext/standard/tests/array/array_count_values_variation.phpt b/ext/standard/tests/array/array_count_values_variation.phpt
index 89d7f37b1..1d614b452 100644
--- a/ext/standard/tests/array/array_count_values_variation.phpt
+++ b/ext/standard/tests/array/array_count_values_variation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_count_values() function : Test all normal paramter variations 
+Test array_count_values() function : Test all normal parameter variations 
 --FILE--
 <?php
 /* Prototype  : proto array array_count_values(array input)
@@ -9,7 +9,7 @@ Test array_count_values() function : Test all normal paramter variations
  */
 
 /*
- * Test behaviour with paramter variations
+ * Test behaviour with parameter variations
  */
 
 echo "*** Testing array_count_values() : parameter variations ***\n";
diff --git a/ext/standard/tests/array/array_fill_basic.phpt b/ext/standard/tests/array/array_fill_basic.phpt
index 8623f8e6c..309c9ca07 100644
--- a/ext/standard/tests/array/array_fill_basic.phpt
+++ b/ext/standard/tests/array/array_fill_basic.phpt
@@ -16,7 +16,7 @@ $heredoc = <<<HERE_DOC
 Hello
 HERE_DOC;
 
-// array of possible valid values for 'val' arugment
+// array of possible valid values for 'val' argument
 $values = array (
   
   /* 1  */  NULL,
diff --git a/ext/standard/tests/array/array_fill_keys_error.phpt b/ext/standard/tests/array/array_fill_keys_error.phpt
index 31a03e7f5..012a729d6 100644
--- a/ext/standard/tests/array/array_fill_keys_error.phpt
+++ b/ext/standard/tests/array/array_fill_keys_error.phpt
@@ -20,7 +20,7 @@ var_dump( array_fill_keys($keys, $val, $extra_arg) );
 echo "\n-- Testing array_fill_keys() function with less than expected no. of arguments --\n";
 var_dump( array_fill_keys($keys) );
 
-echo "\n-- Testing array_fill_keys() function with no argumets --\n";
+echo "\n-- Testing array_fill_keys() function with no arguments --\n";
 var_dump( array_fill_keys() );
 
 echo "Done";
@@ -38,7 +38,7 @@ NULL
 Warning: array_fill_keys() expects exactly 2 parameters, 1 given in %sarray_fill_keys_error.php on line %d
 NULL
 
--- Testing array_fill_keys() function with no argumets --
+-- Testing array_fill_keys() function with no arguments --
 
 Warning: array_fill_keys() expects exactly 2 parameters, 0 given in %sarray_fill_keys_error.php on line %d
 NULL
diff --git a/ext/standard/tests/array/array_fill_variation4.phpt b/ext/standard/tests/array/array_fill_variation4.phpt
index 9e1f50c68..13b566a7d 100644
--- a/ext/standard/tests/array/array_fill_variation4.phpt
+++ b/ext/standard/tests/array/array_fill_variation4.phpt
@@ -17,7 +17,7 @@ $heredoc = <<<HERE_DOC
 Hello
 HERE_DOC;
 
-// array of possible valid values for 'val' arugment 
+// array of possible valid values for 'val' argument 
 $values = array (
 
   /* 1  */  NULL,
diff --git a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt
index 50be08059..e3f0ae08e 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt
@@ -31,7 +31,7 @@ the lazy dog
 This is a double quoted string
 EOT;
 
-// heredoc with diferent whitespaces
+// heredoc with different whitespaces
 $diff_whitespaces = <<<EOT
 hello\r world\t
 1111\t\t != 2222\v\v
diff --git a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt
index ed2e3d951..9eb342f8e 100644
--- a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt
@@ -31,7 +31,7 @@ the lazy dog
 This is a double quoted string
 EOT;
 
-// heredoc with diferent whitespaces
+// heredoc with different whitespaces
 $diff_whitespaces = <<<EOT
 hello\r world\t
 1111\t\t != 2222\v\v
diff --git a/ext/standard/tests/array/array_intersect_variation3.phpt b/ext/standard/tests/array/array_intersect_variation3.phpt
index b2b7d8ac0..c404e58ba 100644
--- a/ext/standard/tests/array/array_intersect_variation3.phpt
+++ b/ext/standard/tests/array/array_intersect_variation3.phpt
@@ -30,7 +30,7 @@ the lazy dog
 This is a double quoted string
 EOT;
 
-// heredoc with diferent whitespaces
+// heredoc with different whitespaces
 $diff_whitespaces = <<<EOT
 hello\r world\t
 1111\t\t != 2222\v\v
diff --git a/ext/standard/tests/array/array_intersect_variation4.phpt b/ext/standard/tests/array/array_intersect_variation4.phpt
index 4f1d6f3dd..66624a66c 100644
--- a/ext/standard/tests/array/array_intersect_variation4.phpt
+++ b/ext/standard/tests/array/array_intersect_variation4.phpt
@@ -30,7 +30,7 @@ the lazy dog
 This is a double quoted string
 EOT;
 
-// heredoc with diferent whitespaces
+// heredoc with different whitespaces
 $diff_whitespaces = <<<EOT
 hello\r world\t
 1111\t\t != 2222\v\v
diff --git a/ext/standard/tests/array/array_key_exists.phpt b/ext/standard/tests/array/array_key_exists.phpt
index f433e1256..37ac0f8ec 100644
--- a/ext/standard/tests/array/array_key_exists.phpt
+++ b/ext/standard/tests/array/array_key_exists.phpt
@@ -114,7 +114,7 @@ var_dump(array_key_exists("print_member", $key_check_obj)); // not found, its a
 var_dump(array_key_exists("arr", $key_check_obj)); //found, public member
 var_dump(array_key_exists("var", $key_check_obj->arr)); //found,  key is in member array
 
-/* error condition, first arguemnt as object */
+/* error condition, first argument as object */
 var_dump( array_key_exists($key_check_obj, $key_check_obj) );
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/array/array_key_exists_variation2.phpt b/ext/standard/tests/array/array_key_exists_variation2.phpt
index a6e9cd2bb..69a1f0a6d 100644
--- a/ext/standard/tests/array/array_key_exists_variation2.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_key_exists() function : usage variations - Pass differnt data types to $search arg
+Test array_key_exists() function : usage variations - Pass different data types to $search arg
 --FILE--
 <?php
 /* Prototype  : bool array_key_exists(mixed $key, array $search)
diff --git a/ext/standard/tests/array/array_merge.phpt b/ext/standard/tests/array/array_merge.phpt
index b718386da..30830de2b 100644
--- a/ext/standard/tests/array/array_merge.phpt
+++ b/ext/standard/tests/array/array_merge.phpt
@@ -79,7 +79,7 @@ echo "\n*** Testing array_merge() with typecasting non-array to array ***\n";
 var_dump(array_merge($begin_array[4], (array)"type1", (array)10, (array)12.34));
 
 echo "\n*** Testing error conditions ***";
-/* Invalid argumens */
+/* Invalid arguments */
 var_dump(array_merge());
 var_dump(array_merge(100, 200));
 var_dump(array_merge($begin_array[0], $begin_array[1], 100));
diff --git a/ext/standard/tests/array/array_merge_recursive_variation3.phpt b/ext/standard/tests/array/array_merge_recursive_variation3.phpt
index 722388a01..76bf91391 100644
--- a/ext/standard/tests/array/array_merge_recursive_variation3.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation3.phpt
@@ -30,7 +30,7 @@ the lazy dog
 This is a double quoted string
 EOT;
 
-// heredoc with diferent whitespaces
+// heredoc with different whitespaces
 $diff_whitespaces = <<<EOT
 hello\r world\t
 1111\t\t != 2222\v\v
diff --git a/ext/standard/tests/array/array_pad_variation6.phpt b/ext/standard/tests/array/array_pad_variation6.phpt
index 2f97e3ee5..a49157390 100644
--- a/ext/standard/tests/array/array_pad_variation6.phpt
+++ b/ext/standard/tests/array/array_pad_variation6.phpt
@@ -31,7 +31,7 @@ the lazy dog
 This is a double quoted string
 EOT;
 
-// heredoc with diferent whitespaces
+// heredoc with different whitespaces
 $diff_whitespaces = <<<EOT
 hello\r world\t
 1111\t\t != 2222\v\v
diff --git a/ext/standard/tests/array/array_search_variation4.phpt b/ext/standard/tests/array/array_search_variation4.phpt
index 04f3b9138..c247879cc 100644
--- a/ext/standard/tests/array/array_search_variation4.phpt
+++ b/ext/standard/tests/array/array_search_variation4.phpt
@@ -16,7 +16,7 @@ $file_handle = fopen(__FILE__, "r");
 //directory type resource
 $dir_handle = opendir( dirname(__FILE__) );
 
-//store resources in array for comparision.
+//store resources in array for comparison.
 $resources = array($file_handle, $dir_handle);
 
 // search for resouce type in the resource array
diff --git a/ext/standard/tests/array/array_unique_variation2.phpt b/ext/standard/tests/array/array_unique_variation2.phpt
index 3cfcfba2b..757dd6e05 100644
--- a/ext/standard/tests/array/array_unique_variation2.phpt
+++ b/ext/standard/tests/array/array_unique_variation2.phpt
@@ -29,7 +29,7 @@ the lazy dog
 This is a double quoted string
 EOT;
 
-// heredoc with diferent whitespaces
+// heredoc with different whitespaces
 $diff_whitespaces = <<<EOT
 hello\r world\t
 1111\t\t != 2222\v\v
diff --git a/ext/standard/tests/array/array_unshift_variation9.phpt b/ext/standard/tests/array/array_unshift_variation9.phpt
index a667e6da0..b6440f899 100644
--- a/ext/standard/tests/array/array_unshift_variation9.phpt
+++ b/ext/standard/tests/array/array_unshift_variation9.phpt
@@ -33,7 +33,7 @@ the lazy dog
 This is a double quoted string
 EOT;
 
-// heredoc with diferent whitespaces
+// heredoc with different whitespaces
 $diff_whitespaces = <<<EOT
 hello\r world\t
 1111\t\t != 2222\v\v
diff --git a/ext/standard/tests/array/array_values_variation7.phpt b/ext/standard/tests/array/array_values_variation7.phpt
index b71306456..660809357 100644
--- a/ext/standard/tests/array/array_values_variation7.phpt
+++ b/ext/standard/tests/array/array_values_variation7.phpt
@@ -9,7 +9,7 @@ Test array_values() function : usage variations - Internal order check
 
 /*
  * Check that array_values is re-assigning keys according to the internal order of the array,
- * and is not dependant on the \$input argument's keys
+ * and is not dependent on the \$input argument's keys
  */
 
 echo "*** Testing array_values() : usage variations ***\n";
diff --git a/ext/standard/tests/array/array_walk_basic2.phpt b/ext/standard/tests/array/array_walk_basic2.phpt
index e856b580b..3ef15605e 100644
--- a/ext/standard/tests/array/array_walk_basic2.phpt
+++ b/ext/standard/tests/array/array_walk_basic2.phpt
@@ -25,7 +25,7 @@ function test_alter(&$item, $key, $prefix)
   // with proper type
   var_dump($item); // value
   var_dump($key);  // key
-  var_dump($prefix); // additional agument passed to callback function
+  var_dump($prefix); // additional argument passed to callback function
   echo "\n"; // new line to separate the output between each element
 }
 
diff --git a/ext/standard/tests/array/array_walk_closure.phpt b/ext/standard/tests/array/array_walk_closure.phpt
new file mode 100644
index 000000000..4e22bb894
--- /dev/null
+++ b/ext/standard/tests/array/array_walk_closure.phpt
@@ -0,0 +1,251 @@
+--TEST--
+array_walk() closure tests
+--FILE--
+<?php
+
+var_dump(array_walk());
+
+$ar = false;
+var_dump(array_walk($ar, $ar));
+
+$ar = NULL;
+var_dump(array_walk($ar, $ar));
+
+$ar = ["one" => 1, "two"=>2, "three" => 3];
+var_dump(array_walk($ar, function(){ var_dump(func_get_args());}));
+
+echo "\nclosure with array\n";
+$ar = ["one" => 1, "two"=>2, "three" => 3];
+$user_data = ["sum" => 42];
+$func = function($value, $key, &$udata) {
+	var_dump($udata);
+	$udata["sum"] += $value;
+};
+
+var_dump(array_walk($ar, $func, $user_data));
+echo "End result:";
+var_dump($user_data["sum"]);
+
+echo "\nclosure with use\n";
+$ar = ["one" => 1, "two"=>2, "three" => 3];
+$user_data = ["sum" => 42];
+$func = function($value, $key) use (&$user_data) {
+	var_dump($user_data);
+	$user_data["sum"] += $value;
+};
+
+var_dump(array_walk($ar, $func, $user_data));
+echo "End result:";
+var_dump($user_data["sum"]);
+
+
+echo "\nclosure with object\n";
+$ar = ["one" => 1, "two"=>2, "three" => 3];
+$user_data = (object)["sum" => 42];
+$func = function($value, $key, &$udata) {
+	var_dump($udata);
+	$udata->sum += $value;
+};
+
+var_dump(array_walk($ar, $func, $user_data));
+echo "End result:";
+var_dump($user_data->sum);
+
+
+
+echo "\nfunction with object\n";
+function sum_it_up_object($value, $key, $udata)
+{
+	var_dump($udata);
+	$udata->sum += $value;
+}
+
+$ar = ["one" => 1, "two"=>2, "three" => 3];
+$user_data = (object)["sum" => 42];
+
+var_dump(array_walk($ar, "sum_it_up_object", $user_data));
+echo "End result:";
+var_dump($user_data->sum);
+
+
+echo "\nfunction with array\n";
+function sum_it_up_array($value, $key, $udata)
+{
+	var_dump($udata);
+	$udata['sum'] += $value;
+}
+
+$ar = ["one" => 1, "two"=>2, "three" => 3];
+$user_data = ["sum" => 42];
+
+var_dump(array_walk($ar, "sum_it_up_array", $user_data));
+echo "End result:";
+var_dump($user_data['sum']);
+
+echo "\nclosure and exception\n";
+$ar = ["one" => 1, "two"=>2, "three" => 3];
+try {
+	var_dump(array_walk($ar, function($v, $k) { if ($v == 2) throw new Exception; } ));
+} catch (Exception $e) {
+	var_dump($e->getTrace());
+}
+
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Warning: array_walk() expects at least 2 parameters, 0 given in %s on line %d
+NULL
+
+Warning: array_walk() expects parameter 1 to be array, boolean given in %s on line %d
+NULL
+
+Warning: array_walk() expects parameter 1 to be array, null given in %s on line %d
+NULL
+array(2) {
+  [0]=>
+  int(1)
+  [1]=>
+  string(3) "one"
+}
+array(2) {
+  [0]=>
+  int(2)
+  [1]=>
+  string(3) "two"
+}
+array(2) {
+  [0]=>
+  int(3)
+  [1]=>
+  string(5) "three"
+}
+bool(true)
+
+closure with array
+array(1) {
+  ["sum"]=>
+  int(42)
+}
+array(1) {
+  ["sum"]=>
+  int(43)
+}
+array(1) {
+  ["sum"]=>
+  int(45)
+}
+bool(true)
+End result:int(42)
+
+closure with use
+array(1) {
+  ["sum"]=>
+  int(42)
+}
+array(1) {
+  ["sum"]=>
+  int(43)
+}
+array(1) {
+  ["sum"]=>
+  int(45)
+}
+bool(true)
+End result:int(48)
+
+closure with object
+object(stdClass)#1 (1) {
+  ["sum"]=>
+  int(42)
+}
+object(stdClass)#1 (1) {
+  ["sum"]=>
+  int(43)
+}
+object(stdClass)#1 (1) {
+  ["sum"]=>
+  int(45)
+}
+bool(true)
+End result:int(48)
+
+function with object
+object(stdClass)#2 (1) {
+  ["sum"]=>
+  int(42)
+}
+object(stdClass)#2 (1) {
+  ["sum"]=>
+  int(43)
+}
+object(stdClass)#2 (1) {
+  ["sum"]=>
+  int(45)
+}
+bool(true)
+End result:int(48)
+
+function with array
+array(1) {
+  ["sum"]=>
+  int(42)
+}
+array(1) {
+  ["sum"]=>
+  int(42)
+}
+array(1) {
+  ["sum"]=>
+  int(42)
+}
+bool(true)
+End result:int(42)
+
+closure and exception
+array(2) {
+  [0]=>
+  array(2) {
+    ["function"]=>
+    string(9) "{closure}"
+    ["args"]=>
+    array(2) {
+      [0]=>
+      int(2)
+      [1]=>
+      string(3) "two"
+    }
+  }
+  [1]=>
+  array(4) {
+    ["file"]=>
+    string(%d) "%s"
+    ["line"]=>
+    int(%d)
+    ["function"]=>
+    string(10) "array_walk"
+    ["args"]=>
+    array(2) {
+      [0]=>
+      &array(3) {
+        ["one"]=>
+        int(1)
+        ["two"]=>
+        int(2)
+        ["three"]=>
+        int(3)
+      }
+      [1]=>
+      object(Closure)#2 (1) {
+        ["parameter"]=>
+        array(2) {
+          ["$v"]=>
+          string(10) "<required>"
+          ["$k"]=>
+          string(10) "<required>"
+        }
+      }
+    }
+  }
+}
+Done
diff --git a/ext/standard/tests/array/array_walk_error2.phpt b/ext/standard/tests/array/array_walk_error2.phpt
index 654637ab5..63c5f51ee 100644
--- a/ext/standard/tests/array/array_walk_error2.phpt
+++ b/ext/standard/tests/array/array_walk_error2.phpt
@@ -25,7 +25,7 @@ echo "*** Testing array_walk() : error conditions - callback parameters ***\n";
 var_dump( array_walk($input, "callback1") );
 var_dump( array_walk($input, "callback2", 4) );
 
-// expected: Warning is supressed
+// expected: Warning is suppressed
 var_dump( @array_walk($input, "callback1") );  
 var_dump( @array_walk($input, "callback2", 4) );  
 
diff --git a/ext/standard/tests/array/array_walk_recursive_basic2.phpt b/ext/standard/tests/array/array_walk_recursive_basic2.phpt
index c71d92b45..a049c0b81 100644
--- a/ext/standard/tests/array/array_walk_recursive_basic2.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_basic2.phpt
@@ -25,7 +25,7 @@ function test_alter(&$item, $key, $prefix)
   // with proper type
   var_dump($item); // value
   var_dump($key);  // key
-  var_dump($prefix); // additional agument passed to callback function
+  var_dump($prefix); // additional argument passed to callback function
   echo "\n"; // new line to separate the output between each element
 }
 
diff --git a/ext/standard/tests/array/array_walk_recursive_error2.phpt b/ext/standard/tests/array/array_walk_recursive_error2.phpt
index d628e9327..8e0c8829e 100644
--- a/ext/standard/tests/array/array_walk_recursive_error2.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_error2.phpt
@@ -25,7 +25,7 @@ echo "*** Testing array_walk_recursive() : error conditions - callback parameter
 var_dump( array_walk_recursive($input, "callback1") );
 var_dump( array_walk_recursive($input, "callback2", 4) );
 
-// expected: Warning is supressed
+// expected: Warning is suppressed
 var_dump( @array_walk_recursive($input, "callback1") );  
 var_dump( @array_walk_recursive($input, "callback2", 4) );  
 
diff --git a/ext/standard/tests/array/arsort_variation1.phpt b/ext/standard/tests/array/arsort_variation1.phpt
index 1545abe34..bff8d4130 100644
--- a/ext/standard/tests/array/arsort_variation1.phpt
+++ b/ext/standard/tests/array/arsort_variation1.phpt
@@ -74,7 +74,7 @@ $unexpected_values = array (
 );
 
 // loop though each element of the array and check the working of arsort()
-// when $array arugment is supplied with different values from $unexpected_values
+// when $array argument is supplied with different values from $unexpected_values
 echo "\n-- Testing arsort() by supplying different unexpected values for 'array' argument --\n";
 echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
 
diff --git a/ext/standard/tests/array/arsort_variation2.phpt b/ext/standard/tests/array/arsort_variation2.phpt
index b85653052..ddfe319a4 100644
--- a/ext/standard/tests/array/arsort_variation2.phpt
+++ b/ext/standard/tests/array/arsort_variation2.phpt
@@ -70,7 +70,7 @@ $unexpected_values = array(
 );
 
 // loop though each element of the array and check the working of arsort()
-// when $flag arugment is supplied with different values from $unexpected_values
+// when $flag argument is supplied with different values from $unexpected_values
 echo "\n-- Testing arsort() by supplying different unexpected values for 'sort_flags' argument --\n";
 
 $counter = 1;
diff --git a/ext/standard/tests/array/asort_variation1.phpt b/ext/standard/tests/array/asort_variation1.phpt
index 5420f0524..67eb5bf21 100644
--- a/ext/standard/tests/array/asort_variation1.phpt
+++ b/ext/standard/tests/array/asort_variation1.phpt
@@ -74,7 +74,7 @@ $unexpected_values = array (
 );
 
 // loop though each element of the array and check the working of asort()
-// when $array arugment is supplied with different values from $unexpected_values
+// when $array argument is supplied with different values from $unexpected_values
 echo "\n-- Testing asort() by supplying different unexpected values for 'array' argument --\n";
 echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
 
diff --git a/ext/standard/tests/array/asort_variation2.phpt b/ext/standard/tests/array/asort_variation2.phpt
index 6cce64433..138e12453 100644
--- a/ext/standard/tests/array/asort_variation2.phpt
+++ b/ext/standard/tests/array/asort_variation2.phpt
@@ -70,7 +70,7 @@ $unexpected_values = array(
 );
 
 // loop though each element of the array and check the working of asort()
-// when $flag arugment is supplied with different values from $unexpected_values
+// when $flag argument is supplied with different values from $unexpected_values
 echo "\n-- Testing asort() by supplying different unexpected values for 'sort_flags' argument --\n";
 
 $counter = 1;
diff --git a/ext/standard/tests/array/bug31158.phpt b/ext/standard/tests/array/bug31158.phpt
index e672a10b2..da7a9ec90 100644
--- a/ext/standard/tests/array/bug31158.phpt
+++ b/ext/standard/tests/array/bug31158.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #31158 (array_splice on $GLOBALS crashes)
+--INI--
+error_reporting = E_ALL
 --FILE--
 <?php
 function __(){
diff --git a/ext/standard/tests/array/bug34066.phpt b/ext/standard/tests/array/bug34066.phpt
index 31f6b4c1d..023f4176f 100644
--- a/ext/standard/tests/array/bug34066.phpt
+++ b/ext/standard/tests/array/bug34066.phpt
@@ -123,7 +123,7 @@ Bug #34066 (recursive array_walk causes segfault)
                 "ProceedKeyArticle"	=>	"01",
                 "ActionKey"		=>	"00",
                 "ContactCommissionArticle"=>	"0,00",
-                "QuantDependantPriceKey"=>	"",
+                "QuantdependentPriceKey"=>	"",
                 "Quant"			=>	"1",
                 "QuantUnit"		=>	"",
                 "Meas" => array(
@@ -584,7 +584,7 @@ gen_xml(prefix=/Docs/Doc/DocItems/DocItem/)
 /Docs/Doc/DocItems/DocItem/ContactCommissionArticle=0,00
 gen_xml(prefix=/Docs/Doc/DocItems/DocItem/) end
 gen_xml(prefix=/Docs/Doc/DocItems/DocItem/)
-/Docs/Doc/DocItems/DocItem/QuantDependantPriceKey
+/Docs/Doc/DocItems/DocItem/QuantdependentPriceKey
 gen_xml(prefix=/Docs/Doc/DocItems/DocItem/) end
 gen_xml(prefix=/Docs/Doc/DocItems/DocItem/)
 /Docs/Doc/DocItems/DocItem/Quant=1
diff --git a/ext/standard/tests/array/bug34066_1.phpt b/ext/standard/tests/array/bug34066_1.phpt
index edc16efd0..6d0f7f84e 100644
--- a/ext/standard/tests/array/bug34066_1.phpt
+++ b/ext/standard/tests/array/bug34066_1.phpt
@@ -123,7 +123,7 @@ Bug #34066 (recursive array_walk causes segfault)
                 "ProceedKeyArticle"	=>	"01",
                 "ActionKey"		=>	"00",
                 "ContactCommissionArticle"=>	"0,00",
-                "QuantDependantPriceKey"=>	"",
+                "QuantdependentPriceKey"=>	"",
                 "Quant"			=>	"1",
                 "QuantUnit"		=>	"",
                 "Meas" => array(
@@ -543,7 +543,7 @@ gen_xml(prefix=/Docs/)
 /Docs/ContactCommissionArticle=0,00
 gen_xml(prefix=/Docs/) end
 gen_xml(prefix=/Docs/)
-/Docs/QuantDependantPriceKey
+/Docs/QuantdependentPriceKey
 gen_xml(prefix=/Docs/) end
 gen_xml(prefix=/Docs/)
 /Docs/Quant=1
diff --git a/ext/standard/tests/array/bug40709.phpt b/ext/standard/tests/array/bug40709.phpt
index eb0c71200..7e132ba3d 100644
--- a/ext/standard/tests/array/bug40709.phpt
+++ b/ext/standard/tests/array/bug40709.phpt
@@ -2,7 +2,7 @@
 Bug #40709 (array_reduce() behaves strange with one item stored arrays)
 --FILE--
 <?php
-function CommaSeperatedList($a, $b) {
+function CommaSeparatedList($a, $b) {
     if($a == null)
         return $b;
     else
@@ -12,10 +12,10 @@ function CommaSeperatedList($a, $b) {
 $arr1 = array(1,2,3);
 $arr2 = array(1);
 
-echo "result for arr1: ".array_reduce($arr1,'CommaSeperatedList')."\n";
-echo "result for arr2: ".array_reduce($arr2,'CommaSeperatedList')."\n";
-echo "result for arr1: ".array_reduce($arr1,'CommaSeperatedList')."\n";
-echo "result for arr2: ".array_reduce($arr2,'CommaSeperatedList')."\n";
+echo "result for arr1: ".array_reduce($arr1,'CommaSeparatedList')."\n";
+echo "result for arr2: ".array_reduce($arr2,'CommaSeparatedList')."\n";
+echo "result for arr1: ".array_reduce($arr1,'CommaSeparatedList')."\n";
+echo "result for arr2: ".array_reduce($arr2,'CommaSeparatedList')."\n";
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/array/bug65304.phpt b/ext/standard/tests/array/bug65304.phpt
new file mode 100644
index 000000000..e5c9dfc5e
--- /dev/null
+++ b/ext/standard/tests/array/bug65304.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Bug #65304 (Use of max int in array_sum)
+--FILE--
+<?php
+var_dump(array_sum(array(PHP_INT_MAX, 1)));
+var_dump(PHP_INT_MAX + 1);
+?>
+--EXPECTF--	
+float(%s)
+float(%s)
diff --git a/ext/standard/tests/array/in_array_variation4.phpt b/ext/standard/tests/array/in_array_variation4.phpt
index b88a5a2d6..a27bb196b 100644
--- a/ext/standard/tests/array/in_array_variation4.phpt
+++ b/ext/standard/tests/array/in_array_variation4.phpt
@@ -19,7 +19,7 @@ $file_handle = fopen(__FILE__, "r");
 //directory type resource
 $dir_handle = opendir( dirname(__FILE__) );
 
-//store resources in array for comparision.
+//store resources in array for comparison.
 $resources = array($file_handle, $dir_handle);
 
 // search for resouce type in the resource array
diff --git a/ext/standard/tests/array/krsort_variation1.phpt b/ext/standard/tests/array/krsort_variation1.phpt
index e4cbaf8d2..fa13242a0 100644
--- a/ext/standard/tests/array/krsort_variation1.phpt
+++ b/ext/standard/tests/array/krsort_variation1.phpt
@@ -72,7 +72,7 @@ $unexpected_values = array (
 );
 
 // loop though each element of the array and check the working of krsort()
-// when $array arugment is supplied with different values from $unexpected_values
+// when $array argument is supplied with different values from $unexpected_values
 echo "\n-- Testing krsort() by supplying different unexpected values for 'array' argument --\n";
 echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
 
diff --git a/ext/standard/tests/array/krsort_variation2.phpt b/ext/standard/tests/array/krsort_variation2.phpt
index 137620247..d193589de 100644
--- a/ext/standard/tests/array/krsort_variation2.phpt
+++ b/ext/standard/tests/array/krsort_variation2.phpt
@@ -69,7 +69,7 @@ $unexpected_values = array (
 );
 
 // loop though each element of the array and check the working of krsort()
-// when 'sort_flags' arugment is supplied with different values
+// when 'sort_flags' argument is supplied with different values
 echo "\n-- Testing krsort() by supplying different unexpected values for 'sort_flags' argument --\n";
 
 $counter = 1;
diff --git a/ext/standard/tests/array/ksort_variation1.phpt b/ext/standard/tests/array/ksort_variation1.phpt
index d8c037fa9..37a35d1c0 100644
--- a/ext/standard/tests/array/ksort_variation1.phpt
+++ b/ext/standard/tests/array/ksort_variation1.phpt
@@ -72,7 +72,7 @@ $unexpected_values = array (
 );
 
 // loop though each element of the array and check the working of ksort()
-// when $array arugment is supplied with different values from $unexpected_values
+// when $array argument is supplied with different values from $unexpected_values
 echo "\n-- Testing ksort() by supplying different unexpected values for 'array' argument --\n";
 echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
 
diff --git a/ext/standard/tests/array/ksort_variation2.phpt b/ext/standard/tests/array/ksort_variation2.phpt
index 4969844e7..102c1c1eb 100644
--- a/ext/standard/tests/array/ksort_variation2.phpt
+++ b/ext/standard/tests/array/ksort_variation2.phpt
@@ -69,7 +69,7 @@ $unexpected_values = array (
 );
 
 // loop though each element of the array and check the working of ksort()
-// when 'sort_flags' arugment is supplied with different values
+// when 'sort_flags' argument is supplied with different values
 echo "\n-- Testing ksort() by supplying different unexpected values for 'sort_flags' argument --\n";
 
 $counter = 1;
diff --git a/ext/standard/tests/array/sizeof_basic2.phpt b/ext/standard/tests/array/sizeof_basic2.phpt
index a2ab2eedf..b56682c31 100644
--- a/ext/standard/tests/array/sizeof_basic2.phpt
+++ b/ext/standard/tests/array/sizeof_basic2.phpt
@@ -19,7 +19,7 @@ echo "*** Testing sizeof() : basic functionality ***\n";
 
 $int_array = array(1, 2, 3, 4);
 $string_array = array("Saffron", "White", "Green");
-$indexed_array = array("Agression" => "Saffron", "Peace" => "White", "Growth" => "Green");
+$indexed_array = array("Aggression" => "Saffron", "Peace" => "White", "Growth" => "Green");
 $mixed_array = array(1, 2, "Aggression" => "Saffron", 10 => "Ten", "Ten" => 10);
 
 echo "-- Testing sizeof() with integer array in default, COUNT_NORMAL, COUNT_RECURSIVE modes --\n";
diff --git a/ext/standard/tests/array/sizeof_variation4.phpt b/ext/standard/tests/array/sizeof_variation4.phpt
index a2462757d..cb8fecc82 100644
--- a/ext/standard/tests/array/sizeof_variation4.phpt
+++ b/ext/standard/tests/array/sizeof_variation4.phpt
@@ -54,7 +54,7 @@ $values = array (
   /* 20 */  $fp
 );
 
-// loop through the each element of the $values array for 'var' arugment 
+// loop through the each element of the $values array for 'var' argument 
 // and check the functionality of sizeof()
 $counter = 1;
 foreach($values as $value)
diff --git a/ext/standard/tests/array/sort_variation1.phpt b/ext/standard/tests/array/sort_variation1.phpt
index f6991bdf6..9243de08e 100644
--- a/ext/standard/tests/array/sort_variation1.phpt
+++ b/ext/standard/tests/array/sort_variation1.phpt
@@ -73,7 +73,7 @@ $unexpected_values = array (
 );
 
 // loop though each element of the array and check the working of sort()
-// when $array arugment is supplied with different values from $unexpected_values 
+// when $array argument is supplied with different values from $unexpected_values 
 echo "\n-- Testing sort() by supplying different unexpected values for 'array' argument --\n";
 echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
 
diff --git a/ext/standard/tests/array/sort_variation2.phpt b/ext/standard/tests/array/sort_variation2.phpt
index 7cb8ed642..af3deba4b 100644
--- a/ext/standard/tests/array/sort_variation2.phpt
+++ b/ext/standard/tests/array/sort_variation2.phpt
@@ -69,7 +69,7 @@ $unexpected_values = array(
 );
 
 // loop though each element of the array and check the working of sort()
-// when $flag arugment is supplied with different values
+// when $flag argument is supplied with different values
 echo "\n-- Testing sort() by supplying different unexpected values for 'flag' argument --\n";
 
 $counter = 1;
diff --git a/ext/standard/tests/array/uasort_error.phpt b/ext/standard/tests/array/uasort_error.phpt
index 820ab5847..cc2dd3a21 100644
--- a/ext/standard/tests/array/uasort_error.phpt
+++ b/ext/standard/tests/array/uasort_error.phpt
@@ -50,7 +50,7 @@ var_dump( uasort($array_arg) );
 echo "-- Testing uasort() function with non-existent compare function --\n";
 var_dump( uasort($array_arg, 'non_existent') );
 
-// With non existent comparison function and extra arguemnt
+// With non existent comparison function and extra argument
 echo "-- Testing uasort() function with non-existent compare function and extra argument --\n";
 var_dump( uasort($array_arg, 'non_existent', $extra_arg) );
 
diff --git a/ext/standard/tests/array/uasort_object2.phpt b/ext/standard/tests/array/uasort_object2.phpt
index cd32d8d94..889db9886 100644
--- a/ext/standard/tests/array/uasort_object2.phpt
+++ b/ext/standard/tests/array/uasort_object2.phpt
@@ -8,7 +8,7 @@ Test uasort() function : object functionality - sort diff. objects
 *
 
 /*
- * This testcase tests uasort() functionality with differnt objects
+ * This testcase tests uasort() functionality with different objects
  * Objects of different classes: 
  *  simple class,
  *  child class,
diff --git a/ext/standard/tests/array/uasort_variation10.phpt b/ext/standard/tests/array/uasort_variation10.phpt
index 809cb78f5..e0c5e72f7 100644
--- a/ext/standard/tests/array/uasort_variation10.phpt
+++ b/ext/standard/tests/array/uasort_variation10.phpt
@@ -11,7 +11,7 @@ Test uasort() function : usage variations - sort array with reference variables
 * Testing uasort() with 'array_arg' containing different reference variables
 */
 
-// comparision function
+// comparison function
 /* Prototype : int cmp_function(mixed $value1, mixed $value2)
  * Parameters : $value1 and $value2 - values to be compared
  * Return value : 0 - if both values are same
diff --git a/ext/standard/tests/array/uasort_variation4.phpt b/ext/standard/tests/array/uasort_variation4.phpt
index c2844bfd2..0ed797fb8 100644
--- a/ext/standard/tests/array/uasort_variation4.phpt
+++ b/ext/standard/tests/array/uasort_variation4.phpt
@@ -12,7 +12,7 @@ Test uasort() function : usage variations - sort different numeric values
 *  integer, octal, hexadecimal & float
 */
 
-// comparision function
+// comparison function
 /* Prototype : int cmp_function(mixed $value1, mixed $value2)
  * Parameters : $value1 and $value2 - values to be compared
  * Return value : 0 - if both values are same
diff --git a/ext/standard/tests/array/usort_error2.phpt b/ext/standard/tests/array/usort_error2.phpt
index 308199fc1..7bf0f659e 100644
--- a/ext/standard/tests/array/usort_error2.phpt
+++ b/ext/standard/tests/array/usort_error2.phpt
@@ -36,7 +36,7 @@ $extra_arg = 10;
 echo "\n-- Testing usort() function with non-existent compare function --\n";
 var_dump( usort($array_arg, 'non_existent') );
 
-// With non existent comparison function and extra arguemnt
+// With non existent comparison function and extra argument
 echo "\n-- Testing usort() function with non-existent compare function and extra argument --\n";
 var_dump( usort($array_arg, 'non_existent', $extra_arg) );
 ?>
diff --git a/ext/standard/tests/class_object/class_exists_variation_001.phpt b/ext/standard/tests/class_object/class_exists_variation_001.phpt
index c9146ba9f..52a358476 100644
--- a/ext/standard/tests/class_object/class_exists_variation_001.phpt
+++ b/ext/standard/tests/class_object/class_exists_variation_001.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test class_exists() function : usage variations - unexpected types for agument 1
+Test class_exists() function : usage variations - unexpected types for argument 1
 --FILE--
 <?php
 /* Prototype  : proto bool class_exists(string classname [, bool autoload])
diff --git a/ext/standard/tests/class_object/class_exists_variation_002.phpt b/ext/standard/tests/class_object/class_exists_variation_002.phpt
index ae9de157f..954e4d8cb 100644
--- a/ext/standard/tests/class_object/class_exists_variation_002.phpt
+++ b/ext/standard/tests/class_object/class_exists_variation_002.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test class_exists() function : usage variations  - unexpected types for agument 2
+Test class_exists() function : usage variations  - unexpected types for argument 2
 --FILE--
 <?php
 /* Prototype  : proto bool class_exists(string classname [, bool autoload])
diff --git a/ext/standard/tests/class_object/trait_exists_variation_001.phpt b/ext/standard/tests/class_object/trait_exists_variation_001.phpt
index 65ef1993c..e7fa4afd1 100644
--- a/ext/standard/tests/class_object/trait_exists_variation_001.phpt
+++ b/ext/standard/tests/class_object/trait_exists_variation_001.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test trait_exists() function : usage variations - unexpected types for agument 1
+Test trait_exists() function : usage variations - unexpected types for argument 1
 --FILE--
 <?php
 /* Prototype  : proto bool trait_exists(string traitname [, bool autoload])
diff --git a/ext/standard/tests/class_object/trait_exists_variation_002.phpt b/ext/standard/tests/class_object/trait_exists_variation_002.phpt
index a2fcbbf01..365efffe4 100644
--- a/ext/standard/tests/class_object/trait_exists_variation_002.phpt
+++ b/ext/standard/tests/class_object/trait_exists_variation_002.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test trait_exists() function : usage variations  - unexpected types for agument 2
+Test trait_exists() function : usage variations  - unexpected types for argument 2
 --FILE--
 <?php
 /* Prototype  : proto bool trait_exists(string traitname [, bool autoload])
diff --git a/ext/standard/tests/file/005_error.phpt b/ext/standard/tests/file/005_error.phpt
index fc4852e4a..20ba3a7fc 100644
--- a/ext/standard/tests/file/005_error.phpt
+++ b/ext/standard/tests/file/005_error.phpt
@@ -23,7 +23,7 @@ Test fileatime(), filemtime(), filectime() & touch() functions : error condition
 echo "*** Testing error conditions ***\n";
 
 echo "\n-- Testing with  Non-existing files --";
-/* Both invalid argumetns */
+/* Both invalid arguments */
 var_dump( fileatime("/no/such/file/or/dir") );
 var_dump( filemtime("/no/such/file/or/dir") );
 var_dump( filectime("/no/such/file/or/dir") );
diff --git a/ext/standard/tests/file/007_variation10.phpt b/ext/standard/tests/file/007_variation10.phpt
index c9f3e01cf..2981ef7d4 100644
--- a/ext/standard/tests/file/007_variation10.phpt
+++ b/ext/standard/tests/file/007_variation10.phpt
@@ -30,7 +30,7 @@ echo "*** Test fopen() & fclose() functions:  with 'r+t' mode ***\n";
 $file_handle = fopen($file, "r+t");  //opening the file in "r+t" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fread($file_handle, 100) );  //Check for read operation
 var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the end of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
diff --git a/ext/standard/tests/file/007_variation11-win32.phpt b/ext/standard/tests/file/007_variation11-win32.phpt
index d9c6e83d4..a567b72b0 100644
--- a/ext/standard/tests/file/007_variation11-win32.phpt
+++ b/ext/standard/tests/file/007_variation11-win32.phpt
@@ -36,12 +36,12 @@ echo "*** Test fopen() & fclose() functions:  with 'wt' mode ***\n";
 $file_handle = fopen($file, "wt");  //opening the file "wt" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
 var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
-var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the begining of the file
+var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 
@@ -53,7 +53,7 @@ clearstatcache();
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "wt") );  //Opening the non-existing file in "wt" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation11.phpt b/ext/standard/tests/file/007_variation11.phpt
index 0656c6460..c884f47f4 100644
--- a/ext/standard/tests/file/007_variation11.phpt
+++ b/ext/standard/tests/file/007_variation11.phpt
@@ -36,12 +36,12 @@ echo "*** Test fopen() & fclose() functions:  with 'wt' mode ***\n";
 $file_handle = fopen($file, "wt");  //opening the file "wt" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
 var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
-var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the begining of the file
+var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 
@@ -53,7 +53,7 @@ clearstatcache();
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "wt") );  //Opening the non-existing file in "wt" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation12-win32.phpt b/ext/standard/tests/file/007_variation12-win32.phpt
index 0fb9ad8df..d3d26e299 100644
--- a/ext/standard/tests/file/007_variation12-win32.phpt
+++ b/ext/standard/tests/file/007_variation12-win32.phpt
@@ -36,7 +36,7 @@ echo "*** Test fopen() & fclose() functions:  with 'w+t' mode ***\n";
 $file_handle = fopen($file, "w+t");  //opening the file "w+t" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
@@ -53,7 +53,7 @@ clearstatcache();
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "w+t") );  //Opening the non-existing file in "w+t" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation12.phpt b/ext/standard/tests/file/007_variation12.phpt
index 44488fa21..c56605ac6 100644
--- a/ext/standard/tests/file/007_variation12.phpt
+++ b/ext/standard/tests/file/007_variation12.phpt
@@ -36,7 +36,7 @@ echo "*** Test fopen() & fclose() functions:  with 'w+t' mode ***\n";
 $file_handle = fopen($file, "w+t");  //opening the file "w+t" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
@@ -53,7 +53,7 @@ clearstatcache();
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "w+t") );  //Opening the non-existing file in "w+t" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation13-win32.phpt b/ext/standard/tests/file/007_variation13-win32.phpt
index 736b10104..fabcde90c 100644
--- a/ext/standard/tests/file/007_variation13-win32.phpt
+++ b/ext/standard/tests/file/007_variation13-win32.phpt
@@ -45,7 +45,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "at") );  //Opening the non-existing file in "at" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation13.phpt b/ext/standard/tests/file/007_variation13.phpt
index 0cb48d366..9d3e6265b 100644
--- a/ext/standard/tests/file/007_variation13.phpt
+++ b/ext/standard/tests/file/007_variation13.phpt
@@ -45,7 +45,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "at") );  //Opening the non-existing file in "at" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation14.phpt b/ext/standard/tests/file/007_variation14.phpt
index ed76ab483..ebcad6d83 100644
--- a/ext/standard/tests/file/007_variation14.phpt
+++ b/ext/standard/tests/file/007_variation14.phpt
@@ -39,7 +39,7 @@ var_dump( get_resource_type($file_handle) );  //Check whether resource is lost a
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "a+t") );  //Opening the non-existing file in "a+t" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation15.phpt b/ext/standard/tests/file/007_variation15.phpt
index 11eed0d5a..1a2d530b6 100644
--- a/ext/standard/tests/file/007_variation15.phpt
+++ b/ext/standard/tests/file/007_variation15.phpt
@@ -28,12 +28,12 @@ echo "*** Test fopen() & fclose() functions:  with 'xt' mode ***\n";
 $file_handle = fopen($file, "xt");  //opening the non-existing file in "xt" mode, file will be created
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
 var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
-var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the begining of the file 
+var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file 
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 $file_handle = fopen($file, "xt");  //Opening the existing data file in 'xt' mode to check for the warning message
diff --git a/ext/standard/tests/file/007_variation16.phpt b/ext/standard/tests/file/007_variation16.phpt
index c725aa183..633299ded 100644
--- a/ext/standard/tests/file/007_variation16.phpt
+++ b/ext/standard/tests/file/007_variation16.phpt
@@ -28,7 +28,7 @@ echo "*** Test fopen() & fclose() functions:  with 'x+t' mode ***\n";
 $file_handle = fopen($file, "x+t");  //opening the non-existing file in "x+t" mode, file will be created
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
diff --git a/ext/standard/tests/file/007_variation18.phpt b/ext/standard/tests/file/007_variation18.phpt
index 991051d5e..88350b842 100644
--- a/ext/standard/tests/file/007_variation18.phpt
+++ b/ext/standard/tests/file/007_variation18.phpt
@@ -30,7 +30,7 @@ echo "*** Test fopen() & fclose() functions:  with 'r+b' mode ***\n";
 $file_handle = fopen($file, "r+b");  //opening the file in "r+b" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fread($file_handle, 100) );  //Check for read operation
 var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the end of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
diff --git a/ext/standard/tests/file/007_variation19.phpt b/ext/standard/tests/file/007_variation19.phpt
index 3830e4fc2..0731d454b 100644
--- a/ext/standard/tests/file/007_variation19.phpt
+++ b/ext/standard/tests/file/007_variation19.phpt
@@ -31,12 +31,12 @@ echo "*** Test fopen() & fclose() functions:  with 'wb' mode ***\n";
 $file_handle = fopen($file, "wb");  //opening the file "wb" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
 var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
-var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the begining of the file
+var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 
@@ -48,7 +48,7 @@ clearstatcache();
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "wb") );  //Opening the non-existing file in "wb" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation2.phpt b/ext/standard/tests/file/007_variation2.phpt
index 4c883ea32..deb51266e 100644
--- a/ext/standard/tests/file/007_variation2.phpt
+++ b/ext/standard/tests/file/007_variation2.phpt
@@ -30,7 +30,7 @@ echo "*** Test fopen() & fclose() functions:  with 'r+' mode ***\n";
 $file_handle = fopen($file, "r+");  //opening the file in "r+" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fread($file_handle, 100) );  //Check for read operation
 var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the end of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
diff --git a/ext/standard/tests/file/007_variation20.phpt b/ext/standard/tests/file/007_variation20.phpt
index 4d66dc7ee..3eddec425 100644
--- a/ext/standard/tests/file/007_variation20.phpt
+++ b/ext/standard/tests/file/007_variation20.phpt
@@ -31,7 +31,7 @@ echo "*** Test fopen() & fclose() functions:  with 'w+b' mode ***\n";
 $file_handle = fopen($file, "w+b");  //opening the file "w+b" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
@@ -48,7 +48,7 @@ clearstatcache();
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "w+b") );  //Opening the non-existing file in "w+b" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation21.phpt b/ext/standard/tests/file/007_variation21.phpt
index 6c968f229..c70aaad78 100644
--- a/ext/standard/tests/file/007_variation21.phpt
+++ b/ext/standard/tests/file/007_variation21.phpt
@@ -40,7 +40,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "ab") );  //Opening the non-existing file in "ab" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation22.phpt b/ext/standard/tests/file/007_variation22.phpt
index d1456fe26..63deee4f8 100644
--- a/ext/standard/tests/file/007_variation22.phpt
+++ b/ext/standard/tests/file/007_variation22.phpt
@@ -39,7 +39,7 @@ var_dump( get_resource_type($file_handle) );  //Check whether resource is lost a
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "a+b") );  //Opening the non-existing file in "a+b" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation23.phpt b/ext/standard/tests/file/007_variation23.phpt
index 528f05a86..1826296a0 100644
--- a/ext/standard/tests/file/007_variation23.phpt
+++ b/ext/standard/tests/file/007_variation23.phpt
@@ -28,12 +28,12 @@ echo "*** Test fopen() & fclose() functions:  with 'xb' mode ***\n";
 $file_handle = fopen($file, "xb");  //opening the non-existing file in "xb" mode, file will be created
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
 var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
-var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the begining of the file 
+var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file 
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 $file_handle = fopen($file, "xb");  //Opening the existing data file in 'xb' mode to check for the warning message
diff --git a/ext/standard/tests/file/007_variation24.phpt b/ext/standard/tests/file/007_variation24.phpt
index 41fc24cbe..d898ba7b5 100644
--- a/ext/standard/tests/file/007_variation24.phpt
+++ b/ext/standard/tests/file/007_variation24.phpt
@@ -28,7 +28,7 @@ echo "*** Test fopen() & fclose() functions:  with 'x+b' mode ***\n";
 $file_handle = fopen($file, "x+b");  //opening the non-existing file in "x+b" mode, file will be created
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
diff --git a/ext/standard/tests/file/007_variation3.phpt b/ext/standard/tests/file/007_variation3.phpt
index cd31eba1e..f4ae03658 100644
--- a/ext/standard/tests/file/007_variation3.phpt
+++ b/ext/standard/tests/file/007_variation3.phpt
@@ -31,12 +31,12 @@ echo "*** Test fopen() & fclose() functions:  with 'w' mode ***\n";
 $file_handle = fopen($file, "w");  //opening the file "w" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
 var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
-var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the begining of the file
+var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 
@@ -48,7 +48,7 @@ clearstatcache();
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "w") );  //Opening the non-existing file in "w" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation4.phpt b/ext/standard/tests/file/007_variation4.phpt
index e88324e83..0dabc5b9a 100644
--- a/ext/standard/tests/file/007_variation4.phpt
+++ b/ext/standard/tests/file/007_variation4.phpt
@@ -31,7 +31,7 @@ echo "*** Test fopen() & fclose() functions:  with 'w+' mode ***\n";
 $file_handle = fopen($file, "w+");  //opening the file "w+" mode
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
@@ -48,7 +48,7 @@ clearstatcache();
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "w+") );  //Opening the non-existing file in "w+" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation5.phpt b/ext/standard/tests/file/007_variation5.phpt
index 931153457..51e366d29 100644
--- a/ext/standard/tests/file/007_variation5.phpt
+++ b/ext/standard/tests/file/007_variation5.phpt
@@ -40,7 +40,7 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "a") );  //Opening the non-existing file in "a" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation6.phpt b/ext/standard/tests/file/007_variation6.phpt
index b274b0592..92c017175 100644
--- a/ext/standard/tests/file/007_variation6.phpt
+++ b/ext/standard/tests/file/007_variation6.phpt
@@ -39,7 +39,7 @@ var_dump( get_resource_type($file_handle) );  //Check whether resource is lost a
 
 unlink($file);  //Deleting the file
 fclose( fopen($file, "a+") );  //Opening the non-existing file in "a+" mode, which will be created
-var_dump( file_exists($file) );  //Check for the existance of file
+var_dump( file_exists($file) );  //Check for the existence of file
 echo "*** Done ***\n"; 
 --CLEAN--
 <?php
diff --git a/ext/standard/tests/file/007_variation7.phpt b/ext/standard/tests/file/007_variation7.phpt
index 131daff55..06bf9117f 100644
--- a/ext/standard/tests/file/007_variation7.phpt
+++ b/ext/standard/tests/file/007_variation7.phpt
@@ -28,12 +28,12 @@ echo "*** Test fopen() & fclose() functions:  with 'x' mode ***\n";
 $file_handle = fopen($file, "x");  //opening the non-existing file in "x" mode, file will be created
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
 var_dump( fread($file_handle, 100) );  //Check for read operation; fails; expected: empty string
-var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the begining of the file 
+var_dump( ftell($file_handle) );  //File pointer position after read operation, expected at the beginning of the file 
 var_dump( fclose($file_handle) );  //Check for close operation on the file handle
 var_dump( get_resource_type($file_handle) );  //Check whether resource is lost after close operation
 $file_handle = fopen($file, "x");  //Opening the existing data file in 'x' mode to check for the warning message
diff --git a/ext/standard/tests/file/007_variation8.phpt b/ext/standard/tests/file/007_variation8.phpt
index aa847115c..fae693204 100644
--- a/ext/standard/tests/file/007_variation8.phpt
+++ b/ext/standard/tests/file/007_variation8.phpt
@@ -28,7 +28,7 @@ echo "*** Test fopen() & fclose() functions:  with 'x+' mode ***\n";
 $file_handle = fopen($file, "x+");  //opening the non-existing file in "x+" mode, file will be created
 var_dump($file_handle);  //Check for the content of handle
 var_dump( get_resource_type($file_handle) );  //Check for the type of resource
-var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the begining of the file
+var_dump( ftell($file_handle) );  //Initial file pointer position, expected at the beginning of the file
 var_dump( fwrite($file_handle, $string) );  //Check for write operation; passes; expected:size of the $string
 var_dump( ftell($file_handle) );  //File pointer position after write operation, expected at the end of the file
 rewind($file_handle);
diff --git a/ext/standard/tests/file/bug24482.phpt b/ext/standard/tests/file/bug24482.phpt
index f545f1add..9d0568af3 100644
--- a/ext/standard/tests/file/bug24482.phpt
+++ b/ext/standard/tests/file/bug24482.phpt
@@ -8,6 +8,11 @@ if (!function_exists("glob")) {
 ?>
 --FILE--
 <?php
+
+// run this test in ext/standard/tests (see bug #64714)
+chdir(__DIR__); // ensure in ext/standard/tests/file
+chdir('..'); // move up to ext/standard/tests
+
 $globdirs = glob("*", GLOB_ONLYDIR);
 
 $dirs = array();
diff --git a/ext/standard/tests/file/bug41874.phpt b/ext/standard/tests/file/bug41874.phpt
index 827f486d4..8cc1ce2e6 100644
--- a/ext/standard/tests/file/bug41874.phpt
+++ b/ext/standard/tests/file/bug41874.phpt
@@ -6,9 +6,9 @@ if(substr(PHP_OS, 0, 3) != 'WIN' ) die('skip windows only test');
 ?>
 --FILE--
 <?php
-$result = exec('cd 1:\non_existant; dir nonexistant');
+$result = exec('cd 1:\non_existent; dir nonexistent');
 echo "$result";
-system('cd 1:\non_existant; dir nonexistant');
+system('cd 1:\non_existent; dir nonexistent');
 ?>
 --EXPECT--
 The system cannot find the drive specified.
diff --git a/ext/standard/tests/file/bug41874_2.phpt b/ext/standard/tests/file/bug41874_2.phpt
index 5d7b7cad8..bf76a749f 100644
--- a/ext/standard/tests/file/bug41874_2.phpt
+++ b/ext/standard/tests/file/bug41874_2.phpt
@@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != 'WIN' ) {
 ?>
 --FILE--
 <?php
-$result = exec('cd 1:\\non_existant; dir nonexistant');
+$result = exec('cd 1:\\non_existent; dir nonexistent');
 echo "$result";
 ?>
 --EXPECT--
diff --git a/ext/standard/tests/file/bug41874_3.phpt b/ext/standard/tests/file/bug41874_3.phpt
index 4d7b139ad..05095c6f1 100644
--- a/ext/standard/tests/file/bug41874_3.phpt
+++ b/ext/standard/tests/file/bug41874_3.phpt
@@ -10,7 +10,7 @@ if(substr(PHP_OS, 0, 3) != 'WIN' ) {
 ?>
 --FILE--
 <?php
-system('cd 1:\\non_existant; dir nonexistant');
+system('cd 1:\\non_existent; dir nonexistent');
 ?>
 --EXPECT--
 The system cannot find the drive specified.
\ No newline at end of file
diff --git a/ext/standard/tests/file/bug52820.phpt b/ext/standard/tests/file/bug52820.phpt
index 91976b04d..3a9f9c31a 100644
--- a/ext/standard/tests/file/bug52820.phpt
+++ b/ext/standard/tests/file/bug52820.phpt
@@ -1,5 +1,5 @@
 --TEST--

-Bug #52820 (writes to fopencookie FILE* not commited when seeking the stream)

+Bug #52820 (writes to fopencookie FILE* not committed when seeking the stream)

 --SKIPIF--

 <?php

 if (!function_exists('leak_variable'))

diff --git a/ext/standard/tests/file/chmod_basic-win32.phpt b/ext/standard/tests/file/chmod_basic-win32.phpt
index ca224f7d1..31d44c80a 100644
--- a/ext/standard/tests/file/chmod_basic-win32.phpt
+++ b/ext/standard/tests/file/chmod_basic-win32.phpt
@@ -1,5 +1,5 @@
 --TEST--
-chmod() basic fuctionality
+chmod() basic functionality
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) != 'WIN') {
diff --git a/ext/standard/tests/file/chmod_basic.phpt b/ext/standard/tests/file/chmod_basic.phpt
index 582f273d4..fc983074f 100644
--- a/ext/standard/tests/file/chmod_basic.phpt
+++ b/ext/standard/tests/file/chmod_basic.phpt
@@ -1,5 +1,5 @@
 --TEST--
-chmod() basic fuctionality
+chmod() basic functionality
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
diff --git a/ext/standard/tests/file/fgetc_variation3.phpt b/ext/standard/tests/file/fgetc_variation3.phpt
index f8349989a..64efaa6cf 100644
--- a/ext/standard/tests/file/fgetc_variation3.phpt
+++ b/ext/standard/tests/file/fgetc_variation3.phpt
@@ -30,7 +30,7 @@ foreach ($file_modes as $file_mode ) {
   $data = "fgetc_variation test";
   fwrite($file_handle, $data);
 
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( rewind($file_handle) ); 
   var_dump( ftell($file_handle) ); 
   var_dump( feof($file_handle) );
diff --git a/ext/standard/tests/file/fgetc_variation4.phpt b/ext/standard/tests/file/fgetc_variation4.phpt
index a2bc9e524..cb6f0cdce 100644
--- a/ext/standard/tests/file/fgetc_variation4.phpt
+++ b/ext/standard/tests/file/fgetc_variation4.phpt
@@ -29,7 +29,7 @@ foreach ($file_modes as $file_mode ) {
   $data = "fgetc\n test";
   fwrite($file_handle, $data);
 
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( rewind($file_handle) ); 
   var_dump( ftell($file_handle) ); 
   var_dump( feof($file_handle) );
diff --git a/ext/standard/tests/file/fgetcsv_variation1.phpt b/ext/standard/tests/file/fgetcsv_variation1.phpt
index 8a698e40a..969c9c034 100644
--- a/ext/standard/tests/file/fgetcsv_variation1.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation1.phpt
@@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation10.phpt b/ext/standard/tests/file/fgetcsv_variation10.phpt
index 250237c21..60a401bb8 100644
--- a/ext/standard/tests/file/fgetcsv_variation10.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation10.phpt
@@ -58,7 +58,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation11.phpt b/ext/standard/tests/file/fgetcsv_variation11.phpt
index 815ede6f0..d5741248f 100644
--- a/ext/standard/tests/file/fgetcsv_variation11.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation11.phpt
@@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation12.phpt b/ext/standard/tests/file/fgetcsv_variation12.phpt
index e513fe676..316868446 100644
--- a/ext/standard/tests/file/fgetcsv_variation12.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation12.phpt
@@ -57,7 +57,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation13.phpt b/ext/standard/tests/file/fgetcsv_variation13.phpt
index a00405b90..f191a2637 100644
--- a/ext/standard/tests/file/fgetcsv_variation13.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation13.phpt
@@ -37,7 +37,7 @@ $loop_counter = 1;
     fwrite($file_handle, "This is line of text without csv fields\n");
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation14.phpt b/ext/standard/tests/file/fgetcsv_variation14.phpt
index 927bf8a07..14c72a24b 100644
--- a/ext/standard/tests/file/fgetcsv_variation14.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation14.phpt
@@ -36,7 +36,7 @@ $loop_counter = 1;
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation15.phpt b/ext/standard/tests/file/fgetcsv_variation15.phpt
index b36b88ed3..c6859497e 100644
--- a/ext/standard/tests/file/fgetcsv_variation15.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation15.phpt
@@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation16.phpt b/ext/standard/tests/file/fgetcsv_variation16.phpt
index 904c42242..9cfdd7246 100644
--- a/ext/standard/tests/file/fgetcsv_variation16.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation16.phpt
@@ -55,7 +55,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation17.phpt b/ext/standard/tests/file/fgetcsv_variation17.phpt
index a54f8da61..b8d918659 100644
--- a/ext/standard/tests/file/fgetcsv_variation17.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation17.phpt
@@ -55,7 +55,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation18.phpt b/ext/standard/tests/file/fgetcsv_variation18.phpt
index 19915e816..f0ebcb7fa 100644
--- a/ext/standard/tests/file/fgetcsv_variation18.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation18.phpt
@@ -55,7 +55,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation19.phpt b/ext/standard/tests/file/fgetcsv_variation19.phpt
index 2e282e170..cb510099b 100644
--- a/ext/standard/tests/file/fgetcsv_variation19.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation19.phpt
@@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation2.phpt b/ext/standard/tests/file/fgetcsv_variation2.phpt
index 7b875b821..d1e446d1f 100644
--- a/ext/standard/tests/file/fgetcsv_variation2.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation2.phpt
@@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation20.phpt b/ext/standard/tests/file/fgetcsv_variation20.phpt
index e96089e9a..70bd8acbb 100644
--- a/ext/standard/tests/file/fgetcsv_variation20.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation20.phpt
@@ -38,7 +38,7 @@ $loop_counter = 1;
     fwrite($file_handle, "This is line of text without csv fields\n");
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation21.phpt b/ext/standard/tests/file/fgetcsv_variation21.phpt
index e6a9ee586..ae8c4f1ef 100644
--- a/ext/standard/tests/file/fgetcsv_variation21.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation21.phpt
@@ -38,7 +38,7 @@ $loop_counter = 1;
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation24.phpt b/ext/standard/tests/file/fgetcsv_variation24.phpt
index 89b6d03b9..cdfadceb7 100644
--- a/ext/standard/tests/file/fgetcsv_variation24.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation24.phpt
@@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation25.phpt b/ext/standard/tests/file/fgetcsv_variation25.phpt
index 1877bc0a0..52e830cb5 100644
--- a/ext/standard/tests/file/fgetcsv_variation25.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation25.phpt
@@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation27.phpt b/ext/standard/tests/file/fgetcsv_variation27.phpt
index aafc3ab6c..a215e90a3 100644
--- a/ext/standard/tests/file/fgetcsv_variation27.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation27.phpt
@@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation28.phpt b/ext/standard/tests/file/fgetcsv_variation28.phpt
index 56dd538ac..4e6fed317 100644
--- a/ext/standard/tests/file/fgetcsv_variation28.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation28.phpt
@@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation29.phpt b/ext/standard/tests/file/fgetcsv_variation29.phpt
index 08c750351..042086032 100644
--- a/ext/standard/tests/file/fgetcsv_variation29.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation29.phpt
@@ -57,7 +57,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation3.phpt b/ext/standard/tests/file/fgetcsv_variation3.phpt
index 52c094faa..8cde39da2 100644
--- a/ext/standard/tests/file/fgetcsv_variation3.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation3.phpt
@@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation31.phpt b/ext/standard/tests/file/fgetcsv_variation31.phpt
index 1d896b791..7d1e90e1f 100644
--- a/ext/standard/tests/file/fgetcsv_variation31.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation31.phpt
@@ -57,7 +57,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation4.phpt b/ext/standard/tests/file/fgetcsv_variation4.phpt
index 0c8448472..da945daa7 100644
--- a/ext/standard/tests/file/fgetcsv_variation4.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation4.phpt
@@ -58,7 +58,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation5.phpt b/ext/standard/tests/file/fgetcsv_variation5.phpt
index 283fa40bd..d3564e401 100644
--- a/ext/standard/tests/file/fgetcsv_variation5.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation5.phpt
@@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation6.phpt b/ext/standard/tests/file/fgetcsv_variation6.phpt
index 9878cb98d..844dd7c51 100644
--- a/ext/standard/tests/file/fgetcsv_variation6.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation6.phpt
@@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation7.phpt b/ext/standard/tests/file/fgetcsv_variation7.phpt
index 723328e08..271a55b00 100644
--- a/ext/standard/tests/file/fgetcsv_variation7.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation7.phpt
@@ -58,7 +58,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation8.phpt b/ext/standard/tests/file/fgetcsv_variation8.phpt
index 21b6c8875..bf06d29b4 100644
--- a/ext/standard/tests/file/fgetcsv_variation8.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation8.phpt
@@ -62,7 +62,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgetcsv_variation9.phpt b/ext/standard/tests/file/fgetcsv_variation9.phpt
index 6400fc84e..294241e6c 100644
--- a/ext/standard/tests/file/fgetcsv_variation9.phpt
+++ b/ext/standard/tests/file/fgetcsv_variation9.phpt
@@ -61,7 +61,7 @@ foreach ($csv_lists as $csv_list) {
     fwrite($file_handle, "\n"); // blank line
 
     // close the file if the mode to be used is read mode  and re-open using read mode
-    // else rewind the file pointer to begining of the file 
+    // else rewind the file pointer to beginning of the file 
     if ( strstr($file_modes[$mode_counter], "r" ) ) {
       fclose($file_handle);
       $file_handle = fopen($filename, $file_modes[$mode_counter]);
diff --git a/ext/standard/tests/file/fgets_variation1.phpt b/ext/standard/tests/file/fgets_variation1.phpt
index 48ea23119..68a20e899 100644
--- a/ext/standard/tests/file/fgets_variation1.phpt
+++ b/ext/standard/tests/file/fgets_variation1.phpt
@@ -29,7 +29,7 @@ foreach ($file_modes as $file_mode ) {
   $data = "fgets_variation test";
   fwrite($file_handle, $data);
 
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( rewind($file_handle) ); 
   var_dump( ftell($file_handle) ); 
   var_dump( feof($file_handle) );
diff --git a/ext/standard/tests/file/fgets_variation3.phpt b/ext/standard/tests/file/fgets_variation3.phpt
index 4f0364132..b39ba0c6a 100644
--- a/ext/standard/tests/file/fgets_variation3.phpt
+++ b/ext/standard/tests/file/fgets_variation3.phpt
@@ -36,7 +36,7 @@ foreach($file_modes as $file_mode) {
     }
 
     echo "-- fgets() with default length, file pointer at 0 --\n";
-    // get the file pointer to begining of the file
+    // get the file pointer to beginning of the file
     rewind($file_handle);
 
     var_dump( ftell($file_handle) );
@@ -45,7 +45,7 @@ foreach($file_modes as $file_mode) {
     var_dump( feof($file_handle) );  // enusre if eof set
 
     echo "-- fgets() with length = 23, Expected: 22 chars, file pointer at 0 --\n";
-    // get the file pointer to begining of the file
+    // get the file pointer to beginning of the file
     rewind($file_handle);
 
     var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/fgetss_basic2-win32.phpt b/ext/standard/tests/file/fgetss_basic2-win32.phpt
index 9187fe532..ca6f40cb9 100644
--- a/ext/standard/tests/file/fgetss_basic2-win32.phpt
+++ b/ext/standard/tests/file/fgetss_basic2-win32.phpt
@@ -48,7 +48,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     exit();
   }
   
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( filesize($filename) );
   var_dump( rewind($file_handle) );
   var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/fgetss_basic2.phpt b/ext/standard/tests/file/fgetss_basic2.phpt
index 63fdde850..86be24810 100644
--- a/ext/standard/tests/file/fgetss_basic2.phpt
+++ b/ext/standard/tests/file/fgetss_basic2.phpt
@@ -46,7 +46,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     exit();
   }
   
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( filesize($filename) );
   var_dump( rewind($file_handle) );
   var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/fgetss_variation1-win32.phpt b/ext/standard/tests/file/fgetss_variation1-win32.phpt
index 0aca5d376..7cd49333b 100644
--- a/ext/standard/tests/file/fgetss_variation1-win32.phpt
+++ b/ext/standard/tests/file/fgetss_variation1-win32.phpt
@@ -56,7 +56,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     exit();
   }
   
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( filesize($filename) );
   var_dump( rewind($file_handle) );
   var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/fgetss_variation1.phpt b/ext/standard/tests/file/fgetss_variation1.phpt
index d85b09556..5a0556a19 100644
--- a/ext/standard/tests/file/fgetss_variation1.phpt
+++ b/ext/standard/tests/file/fgetss_variation1.phpt
@@ -52,7 +52,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     exit();
   }
   
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( filesize($filename) );
   var_dump( rewind($file_handle) );
   var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/fgetss_variation2.phpt b/ext/standard/tests/file/fgetss_variation2.phpt
index d155f0868..a436e8c4b 100644
--- a/ext/standard/tests/file/fgetss_variation2.phpt
+++ b/ext/standard/tests/file/fgetss_variation2.phpt
@@ -44,7 +44,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     exit();
   }
 
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( filesize($filename) );
   var_dump( rewind($file_handle) );
   var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/fgetss_variation3-win32.phpt b/ext/standard/tests/file/fgetss_variation3-win32.phpt
index 7539b3687..fc7561dff 100644
--- a/ext/standard/tests/file/fgetss_variation3-win32.phpt
+++ b/ext/standard/tests/file/fgetss_variation3-win32.phpt
@@ -55,7 +55,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     exit();
   }
   
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   rewind($file_handle);
   var_dump( ftell($file_handle) );
   var_dump( filesize($filename) );
diff --git a/ext/standard/tests/file/fgetss_variation3.phpt b/ext/standard/tests/file/fgetss_variation3.phpt
index 5b339a1bb..e6f63c310 100644
--- a/ext/standard/tests/file/fgetss_variation3.phpt
+++ b/ext/standard/tests/file/fgetss_variation3.phpt
@@ -51,7 +51,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     exit();
   }
   
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   rewind($file_handle);
   var_dump( ftell($file_handle) );
   var_dump( filesize($filename) );
diff --git a/ext/standard/tests/file/fgetss_variation4.phpt b/ext/standard/tests/file/fgetss_variation4.phpt
index 6c201d1a9..b93bc6afd 100644
--- a/ext/standard/tests/file/fgetss_variation4.phpt
+++ b/ext/standard/tests/file/fgetss_variation4.phpt
@@ -47,7 +47,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     exit();
   }
 
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( filesize($filename) );
   var_dump( rewind($file_handle) );
   var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/fgetss_variation5-win32.phpt b/ext/standard/tests/file/fgetss_variation5-win32.phpt
index cedc7b98d..a2d4a705e 100644
--- a/ext/standard/tests/file/fgetss_variation5-win32.phpt
+++ b/ext/standard/tests/file/fgetss_variation5-win32.phpt
@@ -52,7 +52,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     echo "Error: failed to open file $filename!\n";
     exit();
   }
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( filesize($filename) );
   var_dump( rewind($file_handle) );
   var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/fgetss_variation5.phpt b/ext/standard/tests/file/fgetss_variation5.phpt
index ea53382e2..c499d598b 100644
--- a/ext/standard/tests/file/fgetss_variation5.phpt
+++ b/ext/standard/tests/file/fgetss_variation5.phpt
@@ -49,7 +49,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) {
     echo "Error: failed to open file $filename!\n";
     exit();
   }
-  // rewind the file pointer to begining of the file
+  // rewind the file pointer to beginning of the file
   var_dump( filesize($filename) );
   var_dump( rewind($file_handle) );
   var_dump( ftell($file_handle) );
diff --git a/ext/standard/tests/file/file.inc b/ext/standard/tests/file/file.inc
index c0f86e7c3..b3cd99e1c 100644
--- a/ext/standard/tests/file/file.inc
+++ b/ext/standard/tests/file/file.inc
@@ -575,13 +575,13 @@ Description:
   Compares two stat values, stat value should be obtained by stat/lstat
   $stat1 = first stat array
   $stat2 = second stat array
-  $op = type of the comparision to be perform between elements of stat1 and stat2
+  $op = type of the comparison to be perform between elements of stat1 and stat2
     "!=" compare for not equal
     "==" compare for equality
     ">"  if each element of stat1 is > than stat2
     "<"  if each element of stat1 is < than stat2
   $fields = contains the key of the elements that needs to be compared. 
-            type of the comparision is based on $op argument value
+            type of the comparison is based on $op argument value
   $flag = specify true to dump the stat1 and stat2 
 */
 
diff --git a/ext/standard/tests/file/file_get_contents_error001.phpt b/ext/standard/tests/file/file_get_contents_error001.phpt
index 127901ad7..a347d9d3d 100644
--- a/ext/standard/tests/file/file_get_contents_error001.phpt
+++ b/ext/standard/tests/file/file_get_contents_error001.phpt
@@ -10,6 +10,7 @@ display_errors=false
 	if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 	if (!function_exists("file_get_contents"))
 		die ("skip file_get_contents function is not found");
+	if (getenv("SKIP_ONLINE_TESTS")) die("skip online test");
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/fileinode_error.phpt b/ext/standard/tests/file/fileinode_error.phpt
index d716c4ae5..eb5d79e0c 100644
--- a/ext/standard/tests/file/fileinode_error.phpt
+++ b/ext/standard/tests/file/fileinode_error.phpt
@@ -16,10 +16,10 @@ var_dump( fileinode("/no/such/file/dir") );
 var_dump( fileinode("string") );
 var_dump( fileinode(100) );
 
-/* No.of argumetns less than expected */
+/* No.of arguments less than expected */
 var_dump( fileinode() );
 
-/* No.of argumetns greater than expected */
+/* No.of arguments greater than expected */
 var_dump( fileinode(__FILE__, "string") );
 
 echo "\n*** Done ***";
diff --git a/ext/standard/tests/file/fpassthru_variation.phpt b/ext/standard/tests/file/fpassthru_variation.phpt
index 56a039e62..749eefb4c 100644
--- a/ext/standard/tests/file/fpassthru_variation.phpt
+++ b/ext/standard/tests/file/fpassthru_variation.phpt
@@ -12,7 +12,7 @@ echo "*** Testing fpassthru() function with files ***\n\n";
 
 echo "--- Testing with different offsets ---\n";
 
-$file_name = dirname(__FILE__)."/passthru.tmp";
+$file_name = dirname(__FILE__)."/passthru_variation.tmp";
 $file_write = fopen($file_name, "w");
 fwrite($file_write, "1234567890abcdefghijklmnopqrstuvwxyz");
 fclose($file_write);
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt
index 18ecf9a1d..915ab0e55 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2-win32.phpt
@@ -52,7 +52,7 @@ foreach($file_content_types as $file_content_type){
     fwrite($file_handle,(binary)$data_to_be_written);
 
     // set file pointer to 0
-    var_dump( rewind($file_handle) ); // set to begining of file 
+    var_dump( rewind($file_handle) ); // set to beginning of file 
     var_dump( ftell($file_handle) );
 
     foreach($whence_set as $whence){
diff --git a/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt b/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt
index 866009467..63d0edd5a 100644
--- a/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt
+++ b/ext/standard/tests/file/fseek_ftell_rewind_basic2.phpt
@@ -51,7 +51,7 @@ foreach($file_content_types as $file_content_type){
     fwrite($file_handle,(binary)$data_to_be_written);
 
     // set file pointer to 0
-    var_dump( rewind($file_handle) ); // set to begining of file 
+    var_dump( rewind($file_handle) ); // set to beginning of file 
     var_dump( ftell($file_handle) );
 
     foreach($whence_set as $whence){
diff --git a/ext/standard/tests/file/fstat_variation1.phpt b/ext/standard/tests/file/fstat_variation1.phpt
index b2ad54196..14b7b31c4 100644
--- a/ext/standard/tests/file/fstat_variation1.phpt
+++ b/ext/standard/tests/file/fstat_variation1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function fstat() by substituting agument 1 with array values.
+Test function fstat() by substituting argument 1 with array values.
 --FILE--
 <?php
 $index_array = array(1, 2, 3);
diff --git a/ext/standard/tests/file/fstat_variation2.phpt b/ext/standard/tests/file/fstat_variation2.phpt
index fd62f23b6..6368c3b84 100644
--- a/ext/standard/tests/file/fstat_variation2.phpt
+++ b/ext/standard/tests/file/fstat_variation2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function fstat() by substituting agument 1 with boolean values.
+Test function fstat() by substituting argument 1 with boolean values.
 --FILE--
 <?php
 $variation_array = array(
diff --git a/ext/standard/tests/file/fstat_variation3.phpt b/ext/standard/tests/file/fstat_variation3.phpt
index 4cd74e3c1..59de1bbfc 100644
--- a/ext/standard/tests/file/fstat_variation3.phpt
+++ b/ext/standard/tests/file/fstat_variation3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function fstat() by substituting agument 1 with emptyUnsetUndefNull values.
+Test function fstat() by substituting argument 1 with emptyUnsetUndefNull values.
 --FILE--
 <?php
 $unset_var = 10;
diff --git a/ext/standard/tests/file/fstat_variation4.phpt b/ext/standard/tests/file/fstat_variation4.phpt
index 16497760b..dc2575f7d 100644
--- a/ext/standard/tests/file/fstat_variation4.phpt
+++ b/ext/standard/tests/file/fstat_variation4.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function fstat() by substituting agument 1 with float values.
+Test function fstat() by substituting argument 1 with float values.
 --FILE--
 <?php
 $variation_array = array(
diff --git a/ext/standard/tests/file/fstat_variation5.phpt b/ext/standard/tests/file/fstat_variation5.phpt
index ef4f4eaf3..6f98da81e 100644
--- a/ext/standard/tests/file/fstat_variation5.phpt
+++ b/ext/standard/tests/file/fstat_variation5.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function fstat() by substituting agument 1 with int values.
+Test function fstat() by substituting argument 1 with int values.
 --FILE--
 <?php
 $variation_array = array (
diff --git a/ext/standard/tests/file/fstat_variation6.phpt b/ext/standard/tests/file/fstat_variation6.phpt
index 0789ff7a9..01f6d3619 100644
--- a/ext/standard/tests/file/fstat_variation6.phpt
+++ b/ext/standard/tests/file/fstat_variation6.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function fstat() by substituting agument 1 with object values.
+Test function fstat() by substituting argument 1 with object values.
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/file/fstat_variation7.phpt b/ext/standard/tests/file/fstat_variation7.phpt
index 1f3f001b2..5a55dceb9 100644
--- a/ext/standard/tests/file/fstat_variation7.phpt
+++ b/ext/standard/tests/file/fstat_variation7.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function fstat() by substituting agument 1 with string values.
+Test function fstat() by substituting argument 1 with string values.
 --FILE--
 <?php
 $heredoc = <<<EOT
diff --git a/ext/standard/tests/file/glob_variation3.phpt b/ext/standard/tests/file/glob_variation3.phpt
new file mode 100644
index 000000000..9e1e28baf
--- /dev/null
+++ b/ext/standard/tests/file/glob_variation3.phpt
@@ -0,0 +1,19 @@
+--TEST--
+Test glob() function: ensure no platform difference
+--FILE--
+<?php
+$path = dirname(__FILE__);
+
+ini_set('open_basedir', NULL);
+var_dump(glob("$path/*.none"));
+
+ini_set('open_basedir', $path);
+var_dump(glob("$path/*.none"));
+
+?>
+==DONE==
+--EXPECT--
+array(0) {
+}
+bool(false)
+==DONE==
diff --git a/ext/standard/tests/file/lchown_basic.phpt b/ext/standard/tests/file/lchown_basic.phpt
index 9675d3aca..f2aff597c 100644
--- a/ext/standard/tests/file/lchown_basic.phpt
+++ b/ext/standard/tests/file/lchown_basic.phpt
@@ -14,8 +14,8 @@ if (!function_exists("posix_getuid")) die("skip no posix_getuid()");
  */
 
 echo "*** Testing lchown() : basic functionality ***\n";
-$filename = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lchown.txt';
-$symlink = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'symlink.txt';
+$filename = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lchown_basic.txt';
+$symlink = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lchown_basic_symlink.txt';
 
 $uid = posix_getuid();
 
@@ -29,8 +29,8 @@ var_dump( fileowner( $symlink ) === $uid );
 --CLEAN--
 <?php
 
-$filename = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lchown.txt';
-$symlink = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'symlink.txt';
+$filename = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lchown_basic.txt';
+$symlink = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lchown_basic_symlink.txt';
 unlink($filename);
 unlink($symlink);
 
diff --git a/ext/standard/tests/file/lchown_error.phpt b/ext/standard/tests/file/lchown_error.phpt
index 979959e28..bacbd93c8 100644
--- a/ext/standard/tests/file/lchown_error.phpt
+++ b/ext/standard/tests/file/lchown_error.phpt
@@ -36,7 +36,7 @@ var_dump( lchown( $filename ) );
 // More than expected arguments
 var_dump( lchown( $filename, $uid, 'foobar' ) );
 
-// Non-existant filename
+// Non-existent filename
 var_dump( lchown( 'foobar_lchown.txt', $uid ) );
 
 // Wrong argument types
diff --git a/ext/standard/tests/file/mkdir-001.phpt b/ext/standard/tests/file/mkdir-001.phpt
index be653da29..d1a7cebfa 100644
--- a/ext/standard/tests/file/mkdir-001.phpt
+++ b/ext/standard/tests/file/mkdir-001.phpt
@@ -3,20 +3,20 @@ mkdir() tests
 --FILE--
 <?php
 
-var_dump(mkdir("testdir"));
-var_dump(mkdir("testdir/subdir"));
-var_dump(rmdir("testdir/subdir"));
-var_dump(rmdir("testdir"));
+var_dump(mkdir("mkdir-001"));
+var_dump(mkdir("mkdir-001/subdir"));
+var_dump(rmdir("mkdir-001/subdir"));
+var_dump(rmdir("mkdir-001"));
 
-var_dump(mkdir("./testdir"));
-var_dump(mkdir("./testdir/subdir"));
-var_dump(rmdir("./testdir/subdir"));
-var_dump(rmdir("./testdir"));
+var_dump(mkdir("./mkdir-001"));
+var_dump(mkdir("./mkdir-001/subdir"));
+var_dump(rmdir("./mkdir-001/subdir"));
+var_dump(rmdir("./mkdir-001"));
 
-var_dump(mkdir(dirname(__FILE__)."/testdir"));
-var_dump(mkdir(dirname(__FILE__)."/testdir/subdir"));
-var_dump(rmdir(dirname(__FILE__)."/testdir/subdir"));
-var_dump(rmdir(dirname(__FILE__)."/testdir"));
+var_dump(mkdir(dirname(__FILE__)."/mkdir-001"));
+var_dump(mkdir(dirname(__FILE__)."/mkdir-001/subdir"));
+var_dump(rmdir(dirname(__FILE__)."/mkdir-001/subdir"));
+var_dump(rmdir(dirname(__FILE__)."/mkdir-001"));
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/file/mkdir-002.phpt b/ext/standard/tests/file/mkdir-002.phpt
index ccfd6c3d7..d149098df 100644
--- a/ext/standard/tests/file/mkdir-002.phpt
+++ b/ext/standard/tests/file/mkdir-002.phpt
@@ -9,24 +9,24 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 --FILE--
 <?php
 
-var_dump(mkdir("testdir", 0777));
-var_dump(mkdir("testdir/subdir", 0777));
-var_dump(`ls -l testdir`);
-var_dump(rmdir("testdir/subdir"));
-var_dump(rmdir("testdir"));
+var_dump(mkdir("mkdir-002", 0777));
+var_dump(mkdir("mkdir-002/subdir", 0777));
+var_dump(`ls -l mkdir-002`);
+var_dump(rmdir("mkdir-002/subdir"));
+var_dump(rmdir("mkdir-002"));
 
-var_dump(mkdir("./testdir", 0777));
-var_dump(mkdir("./testdir/subdir", 0777));
-var_dump(`ls -l ./testdir`);
-var_dump(rmdir("./testdir/subdir"));
-var_dump(rmdir("./testdir"));
+var_dump(mkdir("./mkdir-002", 0777));
+var_dump(mkdir("./mkdir-002/subdir", 0777));
+var_dump(`ls -l ./mkdir-002`);
+var_dump(rmdir("./mkdir-002/subdir"));
+var_dump(rmdir("./mkdir-002"));
 
-var_dump(mkdir(dirname(__FILE__)."/testdir", 0777));
-var_dump(mkdir(dirname(__FILE__)."/testdir/subdir", 0777));
-$dirname = dirname(__FILE__)."/testdir";
+var_dump(mkdir(dirname(__FILE__)."/mkdir-002", 0777));
+var_dump(mkdir(dirname(__FILE__)."/mkdir-002/subdir", 0777));
+$dirname = dirname(__FILE__)."/mkdir-002";
 var_dump(`ls -l $dirname`);
-var_dump(rmdir(dirname(__FILE__)."/testdir/subdir"));
-var_dump(rmdir(dirname(__FILE__)."/testdir"));
+var_dump(rmdir(dirname(__FILE__)."/mkdir-002/subdir"));
+var_dump(rmdir(dirname(__FILE__)."/mkdir-002"));
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/file/mkdir-003.phpt b/ext/standard/tests/file/mkdir-003.phpt
index 50ad5e6c4..fdd49f340 100644
--- a/ext/standard/tests/file/mkdir-003.phpt
+++ b/ext/standard/tests/file/mkdir-003.phpt
@@ -3,17 +3,17 @@ recursive mkdir() tests
 --FILE--
 <?php
 
-var_dump(mkdir("testdir/subdir", 0777, true));
-var_dump(rmdir("testdir/subdir"));
-var_dump(rmdir("testdir"));
+var_dump(mkdir("mkdir-003/subdir", 0777, true));
+var_dump(rmdir("mkdir-003/subdir"));
+var_dump(rmdir("mkdir-003"));
 
-var_dump(mkdir("./testdir/subdir", 0777, true));
-var_dump(rmdir("./testdir/subdir"));
-var_dump(rmdir("./testdir"));
+var_dump(mkdir("./mkdir-003/subdir", 0777, true));
+var_dump(rmdir("./mkdir-003/subdir"));
+var_dump(rmdir("./mkdir-003"));
 
-var_dump(mkdir(dirname(__FILE__)."/testdir/subdir", 0777, true));
-var_dump(rmdir(dirname(__FILE__)."/testdir/subdir"));
-var_dump(rmdir(dirname(__FILE__)."/testdir"));
+var_dump(mkdir(dirname(__FILE__)."/mkdir-003/subdir", 0777, true));
+var_dump(rmdir(dirname(__FILE__)."/mkdir-003/subdir"));
+var_dump(rmdir(dirname(__FILE__)."/mkdir-003"));
 
 echo "Done\n";
 ?>
diff --git a/ext/standard/tests/file/symlink_to_symlink.phpt b/ext/standard/tests/file/symlink_to_symlink.phpt
index b7554f9bd..8b7ff65cf 100644
--- a/ext/standard/tests/file/symlink_to_symlink.phpt
+++ b/ext/standard/tests/file/symlink_to_symlink.phpt
@@ -19,8 +19,8 @@ symlink(basename($prefix . "_file"), $prefix . "_link1");
 symlink(basename($prefix . "_link1"), $prefix . "_link2");
 
 // symlink to a non-existent path
-@unlink($prefix . "_nonexistant");
-symlink(basename($prefix . "_nonexistant"), $prefix . "_link3");
+@unlink($prefix . "_nonexistent");
+symlink(basename($prefix . "_nonexistent"), $prefix . "_link3");
 
 // symlink to a regular file using an absolute path
 symlink($prefix . "_file", $prefix . "_link4");
@@ -45,6 +45,6 @@ unlink($prefix . "_file");
 --EXPECTF--
 %unicode|string%(%d) "symlink_to_symlink.php_file"
 %unicode|string%(%d) "symlink_to_symlink.php_link1"
-%unicode|string%(%d) "symlink_to_symlink.php_nonexistant"
+%unicode|string%(%d) "symlink_to_symlink.php_nonexistent"
 %unicode|string%(%d) "%s/symlink_to_symlink.php_file"
 %unicode|string%(%d) "%s/symlink_to_symlink.php_link4"
diff --git a/ext/standard/tests/file/tempnam_variation5.phpt b/ext/standard/tests/file/tempnam_variation5.phpt
index 26c3f91f1..cf2eff8be 100644
--- a/ext/standard/tests/file/tempnam_variation5.phpt
+++ b/ext/standard/tests/file/tempnam_variation5.phpt
@@ -16,13 +16,13 @@ if(substr(PHP_OS, 0, 3) == "WIN")
 $file_path = dirname(__FILE__);
 
 echo "*** Test tempnam() function: by passing an existing filename as prefix ***\n";
-$dir_name = $file_path."/tempnam_variation6";
+$dir_name = $file_path."/tempnam_variation5";
 mkdir($dir_name);
-$h = fopen($dir_name."/tempnam_variation6.tmp", "w");
+$h = fopen($dir_name."/tempnam_variation5.tmp", "w");
 
 for($i=1; $i<=3; $i++) {
   echo "-- Iteration $i --\n";
-  $created_file = tempnam("$dir_name", "tempnam_variation6.tmp");
+  $created_file = tempnam("$dir_name", "tempnam_variation5.tmp");
   
   if( file_exists($created_file) ) {
     echo "File name is => ";
@@ -35,7 +35,7 @@ for($i=1; $i<=3; $i++) {
   unlink($created_file);
 }
 fclose($h);
-unlink($dir_name."/tempnam_variation6.tmp");
+unlink($dir_name."/tempnam_variation5.tmp");
 rmdir($dir_name);
 
 echo "\n*** Done ***\n";
@@ -43,10 +43,10 @@ echo "\n*** Done ***\n";
 --EXPECTF--
 *** Test tempnam() function: by passing an existing filename as prefix ***
 -- Iteration 1 --
-File name is => %stempnam_variation6%etempnam_variation6.tmp%s
+File name is => %stempnam_variation5%etempnam_variation5.tmp%s
 -- Iteration 2 --
-File name is => %stempnam_variation6%etempnam_variation6.tmp%s
+File name is => %stempnam_variation5%etempnam_variation5.tmp%s
 -- Iteration 3 --
-File name is => %stempnam_variation6%etempnam_variation6.tmp%s
+File name is => %stempnam_variation5%etempnam_variation5.tmp%s
 
 *** Done ***
diff --git a/ext/standard/tests/file/touch_basic.phpt b/ext/standard/tests/file/touch_basic.phpt
index c41fdf1d7..b39c84b7e 100644
--- a/ext/standard/tests/file/touch_basic.phpt
+++ b/ext/standard/tests/file/touch_basic.phpt
@@ -19,7 +19,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 
 echo "*** Testing touch() : basic functionality ***\n";
 
-$filename = dirname(__FILE__)."/touch.dat";
+$filename = dirname(__FILE__)."/touch_basic.dat";
 
 echo "\n--- testing touch creates a file ---\n";
 @unlink($filename);
diff --git a/ext/standard/tests/file/touch_variation2.phpt b/ext/standard/tests/file/touch_variation2.phpt
index 9ccb90c75..9477a3494 100644
--- a/ext/standard/tests/file/touch_variation2.phpt
+++ b/ext/standard/tests/file/touch_variation2.phpt
@@ -6,7 +6,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 <?php
 
 
-$filename = dirname(__FILE__)."/touch.dat";
+$filename = dirname(__FILE__)."/touch_variation2.dat";
 $fp=fopen($filename,"w");
 fwrite ($fp,"mydata");
 fclose($fp);
diff --git a/ext/standard/tests/file/userstreams.phpt b/ext/standard/tests/file/userstreams.phpt
index b5a9707e9..d39898bbe 100644
--- a/ext/standard/tests/file/userstreams.phpt
+++ b/ext/standard/tests/file/userstreams.phpt
@@ -158,7 +158,7 @@ class mystream
 }
 
 if (@stream_wrapper_register("bogus", "class_not_exist")) {
-	die("Registered a non-existant class!!!???");
+	die("Registered a non-existent class!!!???");
 }
 echo "Not Registered\n";
 
diff --git a/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt b/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt
index e242d45dc..c53b5153f 100644
--- a/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt
+++ b/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt
@@ -1,5 +1,12 @@
 --TEST--
 dl() filename length checks (CVE-2007-4887)
+--SKIPIF--
+<?php
+$enabled_sapi = array('cgi-fcgi', 'cli', 'embed', 'fpm');
+if (!in_array(php_sapi_name(), $enabled_sapi)) {
+	die('skip dl() is not enabled for ' . php_sapi_name());
+}
+?>
 --INI--
 enable_dl=1
 --FILE--
diff --git a/ext/standard/tests/http/bug61548.phpt b/ext/standard/tests/http/bug61548.phpt
new file mode 100644
index 000000000..138b15a33
--- /dev/null
+++ b/ext/standard/tests/http/bug61548.phpt
@@ -0,0 +1,118 @@
+--TEST--
+Bug #61548 (content-type must appear at the end of headers)
+--INI--
+allow_url_fopen=1
+--SKIPIF--
+<?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:12342'); ?>
+--FILE--
+<?php
+require 'server.inc';
+
+function do_test($header) {
+    $options = [
+        'http' => [
+			'method' => 'POST',
+			'header' => $header,
+            'follow_location' => true,
+        ],
+    ];
+
+    $ctx = stream_context_create($options);
+
+    $responses = [
+		"data://text/plain,HTTP/1.1 201\r\nLocation: /foo\r\n\r\n",
+		"data://text/plain,HTTP/1.1 200\r\nConnection: close\r\n\r\n",
+	];
+    $pid = http_server('tcp://127.0.0.1:12342', $responses, $output);
+
+    $fd = fopen('http://127.0.0.1:12342/', 'rb', false, $ctx);
+    fseek($output, 0, SEEK_SET);
+    echo stream_get_contents($output);
+
+    http_server_kill($pid);
+}
+
+do_test("First:1\nSecond:2\nContent-type: text/plain");
+do_test("First:1\nSecond:2\nContent-type: text/plain\n");
+do_test("First:1\nSecond:2\nContent-type: text/plain\nThird:");
+do_test("First:1\nContent-type:text/plain\nSecond:2");
+do_test("First:1\nContent-type:text/plain\nSecond:2\n");
+do_test("First:1\nContent-type:text/plain\nSecond:2\nThird:");
+
+?>
+Done
+--EXPECT--
+POST / HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Second:2
+Content-type: text/plain
+
+GET /foo HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Second:2
+
+
+POST / HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Second:2
+Content-type: text/plain
+
+GET /foo HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Second:2
+
+
+POST / HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Second:2
+Content-type: text/plain
+Third:
+
+GET /foo HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Second:2
+Third:
+
+POST / HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Content-type:text/plain
+Second:2
+
+GET /foo HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Second:2
+
+POST / HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Content-type:text/plain
+Second:2
+
+GET /foo HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Second:2
+
+POST / HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Content-type:text/plain
+Second:2
+Third:
+
+GET /foo HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Second:2
+Third:
+
+Done
+
diff --git a/ext/standard/tests/mail/ezmlm_hash_variation1.phpt b/ext/standard/tests/mail/ezmlm_hash_variation1.phpt
index aa1e521e9..58957c84a 100644
--- a/ext/standard/tests/mail/ezmlm_hash_variation1.phpt
+++ b/ext/standard/tests/mail/ezmlm_hash_variation1.phpt
@@ -24,8 +24,8 @@ class sample  {
 //getting the resource
 $file_handle = fopen(__FILE__, "r");
 
-// array with different values for $delimeter
-$delimeters =  array (
+// array with different values for $delimiter
+$delimiters =  array (
 
   // integer values
   0,
@@ -68,13 +68,13 @@ $delimeters =  array (
   @$unset_var
 );
 
-// loop through with each element of the $delimeters array to test explode() function
+// loop through with each element of the $delimiters array to test explode() function
 $count = 1;
 $string = "piece1 piece2 piece3 piece4 piece5 piece6";
 $limit = 5;
-foreach($delimeters as $delimeter) {
+foreach($delimiters as $delimiter) {
   echo "-- Iteration $count --\n";
-  var_dump( explode($delimeter, $string, $limit) );
+  var_dump( explode($delimiter, $string, $limit) );
   $count ++;
 }
 
diff --git a/ext/standard/tests/mail/mail_include.inc b/ext/standard/tests/mail/mail_include.inc
index a0ff5e0c1..0785552e5 100644
--- a/ext/standard/tests/mail/mail_include.inc
+++ b/ext/standard/tests/mail/mail_include.inc
@@ -15,7 +15,7 @@ $mailbox_prefix = "phpttest"; // name used for test mailbox
  * @para, string mailbox_suffix Suffix used to uniquely identify mailboxes
  * @param int message_count number of test msgs to be written to new mailbox 
  * 
- * @return IMAP stream to new mailbox on sucesss; FALSE on failure
+ * @return IMAP stream to new mailbox on success; FALSE on failure
  */
 function setup_test_mailbox($mailbox_suffix, $message_count, &$new_mailbox = null, $msg_type = "simple"){
 	global $server, $default_mailbox, $username, $password;
diff --git a/ext/standard/tests/serialize/bug65481.phpt b/ext/standard/tests/serialize/bug65481.phpt
new file mode 100644
index 000000000..65634f63b
--- /dev/null
+++ b/ext/standard/tests/serialize/bug65481.phpt
@@ -0,0 +1,40 @@
+--TEST--
+Bug #65481 (shutdown segfault due to serialize)
+--FILE--
+<?php
+echo "Test\n";
+
+class A {
+	public $e = array();
+}
+
+class Token implements \Serializable {
+	public function serialize()
+	{
+		$c = new A;
+
+		for ($i = 0; $i < 4; $i++)
+		{
+			$e = new A;
+			$c->e[] = $e;
+			$e->e = $c->e;
+		}
+
+		return serialize(array(serialize($c)));
+	}
+
+	public function unserialize($str)
+	{
+		$r = unserialize($str);
+		$r = unserialize($r[0]);
+	}
+}
+
+$token = new Token;
+$token = serialize($token);
+
+?>
+Done
+--EXPECT--
+Test
+Done
diff --git a/ext/standard/tests/streams/bug64166.phpt b/ext/standard/tests/streams/bug64166.phpt
new file mode 100644
index 000000000..e725a4b69
--- /dev/null
+++ b/ext/standard/tests/streams/bug64166.phpt
@@ -0,0 +1,46 @@
+--TEST--
+Bug #64166: quoted-printable-encode stream filter incorrectly discarding whitespace
+--FILE--
+<?php
+
+function test_64166($data) {
+    $fd = fopen('php://temp', 'w+');
+    fwrite($fd, $data);
+    rewind($fd);
+
+    $res = stream_filter_append($fd, 'convert.quoted-printable-encode', STREAM_FILTER_READ, array(
+		'line-break-chars' => "\n",
+		'line-length' => 74
+    ));
+    var_dump(stream_get_contents($fd, -1, 0));
+
+    stream_filter_remove($res);
+
+    rewind($fd);
+    stream_filter_append($fd, 'convert.quoted-printable-encode', STREAM_FILTER_READ, array(
+		'line-break-chars' => "\n",
+		'line-length' => 6
+    ));
+    var_dump(stream_get_contents($fd, -1, 0));
+
+    fclose($fd);
+}
+
+test_64166("FIRST \nSECOND");
+test_64166("FIRST  \nSECOND");
+
+?>
+--EXPECT--
+string(15) "FIRST=20
+SECOND"
+string(19) "FIRST=
+=20
+SECON=
+D"
+string(18) "FIRST=20=20
+SECOND"
+string(24) "FIRST=
+=20=
+=20
+SECON=
+D"
diff --git a/ext/standard/tests/streams/bug64166_2.phpt b/ext/standard/tests/streams/bug64166_2.phpt
new file mode 100644
index 000000000..9d6655d5c
--- /dev/null
+++ b/ext/standard/tests/streams/bug64166_2.phpt
@@ -0,0 +1,50 @@
+--TEST--
+Bug #64166: quoted-printable-encode stream filter incorrectly discarding whitespace - split reads
+--FILE--
+<?php
+
+function test_64166($data) {
+    $fd = fopen('php://temp', 'w+');
+    fwrite($fd, $data);
+    rewind($fd);
+
+    $res = stream_filter_append($fd, 'convert.quoted-printable-encode', STREAM_FILTER_READ, array(
+		'line-break-chars' => "\n",
+		'line-length' => 74
+    ));
+    $str = "";
+    while(($c = fread($fd, 1))!= "") $str .= $c; 
+    var_dump($str);
+
+    stream_filter_remove($res);
+
+    rewind($fd);
+    stream_filter_append($fd, 'convert.quoted-printable-encode', STREAM_FILTER_READ, array(
+		'line-break-chars' => "\n",
+		'line-length' => 6
+    ));
+    $str = "";
+    while(($c = fread($fd, 1))!= "") $str .= $c;
+    var_dump($str);
+
+    fclose($fd);
+}
+
+test_64166("FIRST \nSECOND");
+test_64166("FIRST  \nSECOND");
+
+?>
+--EXPECT--
+string(15) "FIRST=20
+SECOND"
+string(19) "FIRST=
+=20
+SECON=
+D"
+string(18) "FIRST=20=20
+SECOND"
+string(24) "FIRST=
+=20=
+=20
+SECON=
+D"
diff --git a/ext/standard/tests/streams/bug64166_3.phpt b/ext/standard/tests/streams/bug64166_3.phpt
new file mode 100644
index 000000000..d896ba800
--- /dev/null
+++ b/ext/standard/tests/streams/bug64166_3.phpt
@@ -0,0 +1,48 @@
+--TEST--
+Bug #64166: quoted-printable-encode stream filter incorrectly discarding whitespace - writes
+--FILE--
+<?php
+
+function test_64166($data) {
+    $fd = fopen('php://temp', 'w+');
+    $res = stream_filter_append($fd, 'convert.quoted-printable-encode', STREAM_FILTER_WRITE, array(
+		'line-break-chars' => "\n",
+		'line-length' => 74
+    ));
+    fwrite($fd, $data);
+    rewind($fd);
+
+    var_dump(stream_get_contents($fd, -1, 0));
+
+    stream_filter_remove($res);
+
+    rewind($fd);
+    stream_filter_append($fd, 'convert.quoted-printable-encode', STREAM_FILTER_WRITE, array(
+		'line-break-chars' => "\n",
+		'line-length' => 6
+    ));
+    fwrite($fd, $data);
+    rewind($fd);
+    var_dump(stream_get_contents($fd, -1, 0));
+
+    fclose($fd);
+}
+
+test_64166("FIRST \nSECOND");
+test_64166("FIRST  \nSECOND");
+
+?>
+--EXPECT--
+string(15) "FIRST=20
+SECOND"
+string(19) "FIRST=
+=20
+SECON=
+D"
+string(18) "FIRST=20=20
+SECOND"
+string(24) "FIRST=
+=20=
+=20
+SECON=
+D"
diff --git a/ext/standard/tests/streams/bug64770.phpt b/ext/standard/tests/streams/bug64770.phpt
new file mode 100644
index 000000000..785c4237a
--- /dev/null
+++ b/ext/standard/tests/streams/bug64770.phpt
@@ -0,0 +1,52 @@
+--TEST--
+Bug #64770 stream_select() fails with pipes from proc_open() 
+--FILE--
+<?php
+
+$descs = array(
+	0 => array('pipe', 'r'), // stdin
+	1 => array('pipe', 'w'), // stdout
+	2 => array('pipe', 'w'), // strerr
+);
+
+$other_opts = array('suppress_errors' => false, 'binary_pipes' => true);
+
+$cmd = (substr(PHP_OS, 0, 3) == 'WIN') ? 'dir' : 'ls';
+$p = proc_open($cmd, $descs, $pipes, '.', NULL, $other_opts);
+
+if (is_resource($p)) {
+	$data = '';
+
+	while (1) {	
+		$w = $e = NULL;
+		$n = stream_select($pipes, $w, $e, 300);
+
+		if ($n === false) {
+			echo "no streams \n";
+			break;
+		} else if ($n === 0) {
+			echo "process timed out\n";
+			proc_terminate($p, 9);
+			break;
+		} else if ($n > 0) {
+			$line = fread($pipes[1], 8192);
+			if (strlen($line) == 0) {
+				/* EOF */
+				break;
+			}
+			$data .= $line;
+		}
+	}
+	var_dump(strlen($data));
+
+	$ret = proc_close($p);
+	var_dump($ret);
+} else {
+	echo "no process\n";
+}
+?>
+==DONE==
+--EXPECTF--
+int(%d)
+int(0)
+==DONE==
diff --git a/ext/standard/tests/streams/bug65483.phpt b/ext/standard/tests/streams/bug65483.phpt
new file mode 100644
index 000000000..d214bbbbc
--- /dev/null
+++ b/ext/standard/tests/streams/bug65483.phpt
@@ -0,0 +1,19 @@
+--TEST--
+Bug #65483: quoted-printable encode stream filter incorrectly encoding spaces
+--FILE--
+<?php
+
+$data = 'a b=c d';
+
+$fd = fopen('php://temp', 'w+');
+fwrite($fd, $data);
+rewind($fd);
+
+$res = stream_filter_append($fd, 'convert.quoted-printable-encode', STREAM_FILTER_READ);
+var_dump(stream_get_contents($fd, -1, 0));
+
+fclose($fd);
+
+?>
+--EXPECT--
+string(9) "a b=3Dc d"
diff --git a/ext/standard/tests/strings/addslashes_variation1.phpt b/ext/standard/tests/strings/addslashes_variation1.phpt
index cc245ae04..6dfeb7e69 100644
--- a/ext/standard/tests/strings/addslashes_variation1.phpt
+++ b/ext/standard/tests/strings/addslashes_variation1.phpt
@@ -79,7 +79,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of addslashes()
-// when $str arugment is supplied with different values
+// when $str argument is supplied with different values
 echo "\n--- Testing addslashes() by supplying different values for 'str' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/bug36306.phpt b/ext/standard/tests/strings/bug36306.phpt
index 2d8449aac..6317c974a 100644
--- a/ext/standard/tests/strings/bug36306.phpt
+++ b/ext/standard/tests/strings/bug36306.phpt
@@ -6,10 +6,10 @@ Bug #36306 (crc32() 64bit)
 /* as an example how to write crc32 tests
    PHP does not have uint values, you cannot
    display crc32 like a signed integer.
-   Have to find some small strings to truely reproduce 
+   Have to find some small strings to truly reproduce 
    the problem, this example being not a problem
 */
-echo dechex(crc32("platform independant")) . "\n";
+echo dechex(crc32("platform independent")) . "\n";
 ?>
 --EXPECT--
-ccd9fe66
+cbd056ba
diff --git a/ext/standard/tests/strings/bug38322.phpt b/ext/standard/tests/strings/bug38322.phpt
index 37f5a93f6..79f66f1fa 100644
--- a/ext/standard/tests/strings/bug38322.phpt
+++ b/ext/standard/tests/strings/bug38322.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #38322 (reading past array in sscanf() leads to segfault/arbitary code execution)
+Bug #38322 (reading past array in sscanf() leads to segfault/arbitrary code execution)
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/bug47322.phpt b/ext/standard/tests/strings/bug47322.phpt
index e04b230ba..1fedc2937 100644
--- a/ext/standard/tests/strings/bug47322.phpt
+++ b/ext/standard/tests/strings/bug47322.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #47322 (sscanf %d does't work)
+Bug #47322 (sscanf %d doesn't work)
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/strings/bug50847.phpt b/ext/standard/tests/strings/bug50847.phpt
index 28e83f511..1f7081930 100644
--- a/ext/standard/tests/strings/bug50847.phpt
+++ b/ext/standard/tests/strings/bug50847.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #50847 (strip_tags() removes all tags greater then 1023 bytes long)
+Bug #50847 (strip_tags() removes all tags greater than 1023 bytes long)
 --FILE--
 <?php
 $var = '<param value="' . str_repeat("a", 2048) . '" />';
diff --git a/ext/standard/tests/strings/bug64879.phpt b/ext/standard/tests/strings/bug64879.phpt
new file mode 100644
index 000000000..1df90c6d8
--- /dev/null
+++ b/ext/standard/tests/strings/bug64879.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Bug #64879: quoted_printable_encode() wrong size calculation (CVE-2013-2110)
+--FILE--
+<?php
+
+quoted_printable_encode(str_repeat("\xf4", 1000)); 
+quoted_printable_encode(str_repeat("\xf4", 100000)); 
+
+echo "Done\n";
+?>
+--EXPECTF--	
+Done
diff --git a/ext/standard/tests/strings/chop_variation1.phpt b/ext/standard/tests/strings/chop_variation1.phpt
index de5ecd816..bb5bca4ec 100644
--- a/ext/standard/tests/strings/chop_variation1.phpt
+++ b/ext/standard/tests/strings/chop_variation1.phpt
@@ -82,7 +82,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of chop()
-// when $str arugment is supplied with different values
+// when $str argument is supplied with different values
 
 echo "\n--- Testing chop() by supplying different values for 'str' argument ---\n";
 $counter = 1;
diff --git a/ext/standard/tests/strings/chop_variation2.phpt b/ext/standard/tests/strings/chop_variation2.phpt
index f0416e77b..02d32306e 100644
--- a/ext/standard/tests/strings/chop_variation2.phpt
+++ b/ext/standard/tests/strings/chop_variation2.phpt
@@ -82,7 +82,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of chop()
-// when $charlist arugment is supplied with different values
+// when $charlist argument is supplied with different values
 
 echo "\n--- Testing chop() by supplying different values for 'charlist' argument ---\n";
 $counter = 1;
diff --git a/ext/standard/tests/strings/chunk_split_error.phpt b/ext/standard/tests/strings/chunk_split_error.phpt
index 9313b65b5..341f04ffd 100644
--- a/ext/standard/tests/strings/chunk_split_error.phpt
+++ b/ext/standard/tests/strings/chunk_split_error.phpt
@@ -10,7 +10,7 @@ Test chunk_split() function : error conditions
 
 /*
 * Testing error conditions of chunk_split() with zero arguments 
-* and for more than expected number of argments 
+* and for more than expected number of arguments 
 */
 
 echo "*** Testing chunk_split() : error conditions ***\n";
diff --git a/ext/standard/tests/strings/explode_error.phpt b/ext/standard/tests/strings/explode_error.phpt
index f7342e7ad..e88b1b0c6 100644
--- a/ext/standard/tests/strings/explode_error.phpt
+++ b/ext/standard/tests/strings/explode_error.phpt
@@ -14,11 +14,11 @@ echo "\n-- Testing explode() function with no arguments --\n";
 var_dump( explode() );
 
 echo "\n-- Testing explode() function with more than expected no. of arguments --\n";
-$delimeter = " ";
+$delimiter = " ";
 $string = "piece1 piece2 piece3 piece4 piece5 piece6";
 $limit = 5;
 $extra_arg = 10;
-var_dump( explode($delimeter, $string, $limit, $extra_arg) );
+var_dump( explode($delimiter, $string, $limit, $extra_arg) );
 
 ?>
 ===Done===
diff --git a/ext/standard/tests/strings/explode_variation1.phpt b/ext/standard/tests/strings/explode_variation1.phpt
index 9c9ce1169..f16f69bec 100644
--- a/ext/standard/tests/strings/explode_variation1.phpt
+++ b/ext/standard/tests/strings/explode_variation1.phpt
@@ -24,8 +24,8 @@ class sample  {
 //getting the resource
 $file_handle = fopen(__FILE__, "r");
 
-// array with different values for $delimeter
-$delimeters =  array (
+// array with different values for $delimiter
+$delimiters =  array (
 
 		  // integer values
 /*1*/	  0,
@@ -68,13 +68,13 @@ $delimeters =  array (
 /*22*/	  @$unset_var
 );
 
-// loop through with each element of the $delimeters array to test explode() function
+// loop through with each element of the $delimiters array to test explode() function
 $count = 1;
 $string = "piece1 piece2 piece3 piece4 piece5 piece6";
 $limit = 5;
-foreach($delimeters as $delimeter) {
+foreach($delimiters as $delimiter) {
   echo "-- Iteration $count --\n";
-  var_dump( explode($delimeter, $string, $limit) );
+  var_dump( explode($delimiter, $string, $limit) );
   $count ++;
 }
 
diff --git a/ext/standard/tests/strings/explode_variation2.phpt b/ext/standard/tests/strings/explode_variation2.phpt
index 9e1f72c5a..4de4637ac 100644
--- a/ext/standard/tests/strings/explode_variation2.phpt
+++ b/ext/standard/tests/strings/explode_variation2.phpt
@@ -70,11 +70,11 @@ $strings =  array (
 
 // loop through with each element of the $strings array to test explode() function
 $count = 1;
-$delimeter = " ";
+$delimiter = " ";
 $limit = 5;
 foreach($strings as $string) {
   echo "-- Iteration $count --\n";
-  var_dump( explode($delimeter, $string, $limit) );
+  var_dump( explode($delimiter, $string, $limit) );
   $count ++;
 }
 
diff --git a/ext/standard/tests/strings/explode_variation3.phpt b/ext/standard/tests/strings/explode_variation3.phpt
index 54d5222ca..2e8789310 100644
--- a/ext/standard/tests/strings/explode_variation3.phpt
+++ b/ext/standard/tests/strings/explode_variation3.phpt
@@ -24,7 +24,7 @@ class sample  {
 //getting the resource
 $file_handle = fopen(__FILE__, "r");
 
-// array with different values for $delimeter
+// array with different values for $delimiter
 $limits =  array (
 
 		  // integer values
@@ -70,11 +70,11 @@ $limits =  array (
 
 // loop through with each element of the $limits array to test explode() function
 $count = 1;
-$delimeter = " ";
+$delimiter = " ";
 $string = "piece1 piece2 piece3 piece4 piece5 piece6";
 foreach($limits as $limit) {
   echo "-- Iteration $count --\n";
-  var_dump( explode($delimeter, $string, $limit) );
+  var_dump( explode($delimiter, $string, $limit) );
   $count ++;
 }
 
diff --git a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt
index 7f7e22935..76d590c35 100644
--- a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt
+++ b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt
@@ -65,7 +65,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of get_html_translation_table()
-// when $table arugment is supplied with different values
+// when $table argument is supplied with different values
 echo "\n--- Testing get_html_translation_table() by supplying different values for 'table' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/get_html_translation_table_variation2.phpt b/ext/standard/tests/strings/get_html_translation_table_variation2.phpt
index b792a5554..ea42af996 100644
--- a/ext/standard/tests/strings/get_html_translation_table_variation2.phpt
+++ b/ext/standard/tests/strings/get_html_translation_table_variation2.phpt
@@ -68,7 +68,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of get_html_translation_table()
-// when $quote_style arugment is supplied with different values
+// when $quote_style argument is supplied with different values
 echo "\n--- Testing get_html_translation_table() by supplying different values for 'quote_style' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt
index b15307614..b36556f1a 100644
--- a/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt
+++ b/ext/standard/tests/strings/htmlspecialchars_decode_variation3.phpt
@@ -30,7 +30,7 @@ $multiline_string = <<<EOT
 &quot;This is a double quoted string&quot;
 EOT;
 
-// heredoc with diferent whitespaces
+// heredoc with different whitespaces
 $diff_whitespaces = <<<EOT
 <html>Roy&#039;s height\r &gt; Sam\t&#039;s height
 1111\t\t &amp; 0000\v\v = \f0000
diff --git a/ext/standard/tests/strings/implode1.phpt b/ext/standard/tests/strings/implode1.phpt
index 4d3502f18..3997c54b5 100644
--- a/ext/standard/tests/strings/implode1.phpt
+++ b/ext/standard/tests/strings/implode1.phpt
diff --git a/ext/standard/tests/strings/join_variation1.phpt b/ext/standard/tests/strings/join_variation1.phpt
index 02bcf3440..e2635f05f 100644
--- a/ext/standard/tests/strings/join_variation1.phpt
+++ b/ext/standard/tests/strings/join_variation1.phpt
@@ -84,7 +84,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of join()
-// when $glue arugment is supplied with different values
+// when $glue argument is supplied with different values
 echo "\n--- Testing join() by supplying different values for 'glue' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/join_variation2.phpt b/ext/standard/tests/strings/join_variation2.phpt
index 50395f176..46e91afd3 100644
--- a/ext/standard/tests/strings/join_variation2.phpt
+++ b/ext/standard/tests/strings/join_variation2.phpt
@@ -82,7 +82,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of join()
-// when $pieces arugment is supplied with different values
+// when $pieces argument is supplied with different values
 echo "\n--- Testing join() by supplying different values for 'pieces' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/lcfirst.phpt b/ext/standard/tests/strings/lcfirst.phpt
index 4c5bec898..e603f4bbf 100644
--- a/ext/standard/tests/strings/lcfirst.phpt
+++ b/ext/standard/tests/strings/lcfirst.phpt
diff --git a/ext/standard/tests/strings/setlocale_basic1.phpt b/ext/standard/tests/strings/setlocale_basic1.phpt
index 957357f6c..c806e6fab 100644
--- a/ext/standard/tests/strings/setlocale_basic1.phpt
+++ b/ext/standard/tests/strings/setlocale_basic1.phpt
@@ -14,7 +14,7 @@ if (setlocale(LC_ALL, "en_US.utf8", "en_AU.utf8", "ko_KR.utf8", "zh_CN.utf8", "d
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
               : string setlocale(int $category , array $locale);  
  * Description: Sets locale information.Returns the new current locale , 
- *              or FALSE if locale functinality is not implemented in this platform. 
+ *              or FALSE if locale functionality is not implemented in this platform. 
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/setlocale_basic2.phpt b/ext/standard/tests/strings/setlocale_basic2.phpt
index fe61b9b43..7204c4591 100644
--- a/ext/standard/tests/strings/setlocale_basic2.phpt
+++ b/ext/standard/tests/strings/setlocale_basic2.phpt
@@ -14,7 +14,7 @@ if (setlocale(LC_ALL, "en_US.utf8", "en_AU.utf8", "ko_KR.utf8", "zh_CN.utf8", "d
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
               : string setlocale(int $category , array $locale);  
  * Description: Sets locale information.Returns the new current locale , or FALSE
-                if locale  functinality is not implemented in this platform. 
+                if locale  functionality is not implemented in this platform. 
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/setlocale_basic3.phpt b/ext/standard/tests/strings/setlocale_basic3.phpt
index 47917e34e..997dad98e 100644
--- a/ext/standard/tests/strings/setlocale_basic3.phpt
+++ b/ext/standard/tests/strings/setlocale_basic3.phpt
@@ -14,7 +14,7 @@ if (setlocale(LC_ALL, "en_US.utf8", "Ko_KR.utf8", "zh_CN.utf8") === false) {
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
               : string setlocale(int $category , array $locale);
  * Description: Sets locale information.Returns the new current locale , or FALSE
-                if locale functinality is not implemented in this platform.
+                if locale functionality is not implemented in this platform.
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/setlocale_error.phpt b/ext/standard/tests/strings/setlocale_error.phpt
index e3f3765fb..361d00c58 100644
--- a/ext/standard/tests/strings/setlocale_error.phpt
+++ b/ext/standard/tests/strings/setlocale_error.phpt
@@ -12,7 +12,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 <?php
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
               : string setlocale(int $category , array $locale);  
- * Description: Sets locale information.Returns the new current locale , or FALSE if locale functinality is not implemented in this platform. 
+ * Description: Sets locale information.Returns the new current locale , or FALSE if locale functionality is not implemented in this platform. 
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/setlocale_variation1.phpt b/ext/standard/tests/strings/setlocale_variation1.phpt
index 5e21d0b79..04665b545 100644
--- a/ext/standard/tests/strings/setlocale_variation1.phpt
+++ b/ext/standard/tests/strings/setlocale_variation1.phpt
@@ -14,7 +14,7 @@ if (setlocale(LC_ALL, "en_US.utf8", "Ko_KR.utf8", "zh_CN.utf8") === false) {
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
               : string setlocale(int $category , array $locale);
  * Description: Sets locale information.Returns the new current locale , or FALSE
-                if locale functinality is not implemented in this platform.
+                if locale functionality is not implemented in this platform.
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/setlocale_variation2.phpt b/ext/standard/tests/strings/setlocale_variation2.phpt
index af8739a76..038ba58c5 100644
--- a/ext/standard/tests/strings/setlocale_variation2.phpt
+++ b/ext/standard/tests/strings/setlocale_variation2.phpt
@@ -11,7 +11,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
               : string setlocale(int $category , array $locale);  
  * Description: Sets locale information.Returns the new current locale , or FALSE 
-                if locale functinality is not implemented in this platform. 
+                if locale functionality is not implemented in this platform. 
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/setlocale_variation3.phpt b/ext/standard/tests/strings/setlocale_variation3.phpt
index 09d6c1186..44cbe1bda 100644
--- a/ext/standard/tests/strings/setlocale_variation3.phpt
+++ b/ext/standard/tests/strings/setlocale_variation3.phpt
@@ -14,7 +14,7 @@ if (setlocale(LC_ALL,'en_US.utf8') === false) {
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
  *            : string setlocale(int $category , array $locale);  
  * Description: Sets locale information.Returns the new current locale , or FALSE
- *              if locale functinality is not implemented in this platform. 
+ *              if locale functionality is not implemented in this platform. 
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/setlocale_variation4.phpt b/ext/standard/tests/strings/setlocale_variation4.phpt
index 4ab1db7ad..7b27c106d 100644
--- a/ext/standard/tests/strings/setlocale_variation4.phpt
+++ b/ext/standard/tests/strings/setlocale_variation4.phpt
@@ -16,7 +16,7 @@ LC_ALL=en_US.utf8;
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
  *            : string setlocale(int $category , array $locale);  
  * Description: Sets locale information.Returns the new current locale , or FALSE
- *              if locale functinality is not implemented in this platform. 
+ *              if locale functionality is not implemented in this platform. 
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/setlocale_variation5.phpt b/ext/standard/tests/strings/setlocale_variation5.phpt
index c8e947b09..40eda3780 100644
--- a/ext/standard/tests/strings/setlocale_variation5.phpt
+++ b/ext/standard/tests/strings/setlocale_variation5.phpt
@@ -16,7 +16,7 @@ LC_ALL=en_US.utf8;
 /* Prototype  : string setlocale (int $category , string $locale [,string $..] )
  *            : string setlocale(int $category , array $locale);  
  * Description: Sets locale information.Returns the new current locale , or FALSE 
- *              if locale functinality is not implemented in this platform. 
+ *              if locale functionality is not implemented in this platform. 
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/str_replace.phpt b/ext/standard/tests/strings/str_replace.phpt
index 830378b9a..15c1c8e53 100644
--- a/ext/standard/tests/strings/str_replace.phpt
+++ b/ext/standard/tests/strings/str_replace.phpt
@@ -120,7 +120,7 @@ var_dump($count);
 echo "\n-- Testing objects --\n";
 /* we get "Catchable fatal error: saying Object of class could not be converted
         to string" by default, when an object is passed instead of string:
-The error can be  avoided by chosing the __toString magix method as follows: */
+The error can be  avoided by choosing the __toString magix method as follows: */
 
 class subject 
 {
diff --git a/ext/standard/tests/strings/str_replace_variation3.phpt b/ext/standard/tests/strings/str_replace_variation3.phpt
index 9b19153fa..7b46f8b28 100644
--- a/ext/standard/tests/strings/str_replace_variation3.phpt
+++ b/ext/standard/tests/strings/str_replace_variation3.phpt
@@ -33,7 +33,7 @@ var_dump($count);
 echo "\n-- Testing objects --\n";
 /* we get "Catchable fatal error: saying Object of class could not be converted
         to string" by default, when an object is passed instead of string:
-The error can be  avoided by chosing the __toString magix method as follows: */
+The error can be  avoided by choosing the __toString magix method as follows: */
 
 class subject 
 {
diff --git a/ext/standard/tests/strings/strcasecmp.phpt b/ext/standard/tests/strings/strcasecmp.phpt
index 33694f987..b3452cfd7 100644
--- a/ext/standard/tests/strings/strcasecmp.phpt
+++ b/ext/standard/tests/strings/strcasecmp.phpt
diff --git a/ext/standard/tests/strings/strcmp.phpt b/ext/standard/tests/strings/strcmp.phpt
index 069388011..e77ed6e46 100644
--- a/ext/standard/tests/strings/strcmp.phpt
+++ b/ext/standard/tests/strings/strcmp.phpt
diff --git a/ext/standard/tests/strings/strcspn_variation2.phpt b/ext/standard/tests/strings/strcspn_variation2.phpt
index cb7544c2a..c21af6f25 100644
--- a/ext/standard/tests/strings/strcspn_variation2.phpt
+++ b/ext/standard/tests/strings/strcspn_variation2.phpt
@@ -15,7 +15,7 @@ error_reporting(E_ALL & ~E_NOTICE);
 * Testing strcspn() : with different unexpected values for mask argument
 */
 
-echo "*** Testing strcspn() : with diferent unexpected values of mask argument ***\n";
+echo "*** Testing strcspn() : with different unexpected values of mask argument ***\n";
 
 $str = 'string_val';
 $start = 1;
@@ -102,7 +102,7 @@ fclose($file_handle);
 echo "Done"
 ?>
 --EXPECTF--
-*** Testing strcspn() : with diferent unexpected values of mask argument ***
+*** Testing strcspn() : with different unexpected values of mask argument ***
 
 -- Iteration with mask value as "0" --
 int(10)
diff --git a/ext/standard/tests/strings/strip_tags_variation5.phpt b/ext/standard/tests/strings/strip_tags_variation5.phpt
index 54601e9b6..20b569390 100644
--- a/ext/standard/tests/strings/strip_tags_variation5.phpt
+++ b/ext/standard/tests/strings/strip_tags_variation5.phpt
@@ -33,7 +33,7 @@ $multiline_string = <<<EOT
 <b>This is a double quoted string</b>
 EOT;
 
-// here doc with diferent whitespaces
+// here doc with different whitespaces
 $diff_whitespaces = <<<EOT
 <html>hello\r world\t
 1111\t\t != 2222\v\v</html>
diff --git a/ext/standard/tests/strings/stripcslashes_variation1.phpt b/ext/standard/tests/strings/stripcslashes_variation1.phpt
index 32c8963df..a2754c610 100644
--- a/ext/standard/tests/strings/stripcslashes_variation1.phpt
+++ b/ext/standard/tests/strings/stripcslashes_variation1.phpt
@@ -81,7 +81,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of stripcslashes()
-// when $str arugment is supplied with different values
+// when $str argument is supplied with different values
 echo "\n--- Testing stripcslashes() by supplying different values for 'str' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/stripslashes_variation1.phpt b/ext/standard/tests/strings/stripslashes_variation1.phpt
index 5693a26ef..fb104199b 100644
--- a/ext/standard/tests/strings/stripslashes_variation1.phpt
+++ b/ext/standard/tests/strings/stripslashes_variation1.phpt
@@ -80,7 +80,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of stripslashes()
-// when $str arugment is supplied with different values
+// when $str argument is supplied with different values
 echo "\n--- Testing stripslashes() by supplying different values for 'str' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/strlen.phpt b/ext/standard/tests/strings/strlen.phpt
index 5a1114d5c..df39f2469 100644
--- a/ext/standard/tests/strings/strlen.phpt
+++ b/ext/standard/tests/strings/strlen.phpt
diff --git a/ext/standard/tests/strings/strpos.phpt b/ext/standard/tests/strings/strpos.phpt
index 9b44584ee..44785ef6c 100644
--- a/ext/standard/tests/strings/strpos.phpt
+++ b/ext/standard/tests/strings/strpos.phpt
diff --git a/ext/standard/tests/strings/strrchr_basic.phpt b/ext/standard/tests/strings/strrchr_basic.phpt
index f39683483..b5bfe2d9c 100644
--- a/ext/standard/tests/strings/strrchr_basic.phpt
+++ b/ext/standard/tests/strings/strrchr_basic.phpt
@@ -30,11 +30,11 @@ var_dump( strrchr("Hello, World", "Hello, World") ); //needle as haystack
 //needle string containing one existing and one non-existing char
 var_dump( strrchr("Hello, World", "Hi") );
 
-//multiple existance of needle in haystack
+//multiple existence of needle in haystack
 var_dump( strrchr("Hello, World", "o") );
 var_dump( strrchr("Hello, World", "ooo") );
 
-var_dump( strrchr("Hello, World", "Zzzz") ); //non-existant needle in haystack
+var_dump( strrchr("Hello, World", "Zzzz") ); //non-existent needle in haystack
 echo "*** Done ***";
 ?>
 --EXPECTF--
diff --git a/ext/standard/tests/strings/strspn_variation2.phpt b/ext/standard/tests/strings/strspn_variation2.phpt
index 7af61e559..57929fa35 100644
--- a/ext/standard/tests/strings/strspn_variation2.phpt
+++ b/ext/standard/tests/strings/strspn_variation2.phpt
@@ -15,7 +15,7 @@ error_reporting(E_ALL & ~E_NOTICE);
 * Testing strspn() : with different unexpected values for mask argument
 */
 
-echo "*** Testing strspn() : with diferent unexpected values of mask argument ***\n";
+echo "*** Testing strspn() : with different unexpected values of mask argument ***\n";
 
 $str = 'string_val';
 $start = 1;
@@ -102,7 +102,7 @@ fclose($file_handle);
 echo "Done"
 ?>
 --EXPECTF--
-*** Testing strspn() : with diferent unexpected values of mask argument ***
+*** Testing strspn() : with different unexpected values of mask argument ***
 
 -- Iteration with mask value as "0" --
 int(0)
diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt
index b135258f8..bdedb7e9f 100644
--- a/ext/standard/tests/strings/strstr.phpt
+++ b/ext/standard/tests/strings/strstr.phpt
diff --git a/ext/standard/tests/strings/strtok_variation1.phpt b/ext/standard/tests/strings/strtok_variation1.phpt
index b8febacfb..cb06fc43c 100644
--- a/ext/standard/tests/strings/strtok_variation1.phpt
+++ b/ext/standard/tests/strings/strtok_variation1.phpt
@@ -81,7 +81,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of strtok()
-// when $str arugment is supplied with different values
+// when $str argument is supplied with different values
 
 echo "\n--- Testing strtok() by supplying different values for 'str' argument ---\n";
 $counter = 1;
diff --git a/ext/standard/tests/strings/strtok_variation2.phpt b/ext/standard/tests/strings/strtok_variation2.phpt
index 19a6f26fb..13da44058 100644
--- a/ext/standard/tests/strings/strtok_variation2.phpt
+++ b/ext/standard/tests/strings/strtok_variation2.phpt
@@ -81,7 +81,7 @@ $values =  array (
 
 
 // loop through each element of the array and check the working of strtok()
-// when $token arugment is supplied with different values
+// when $token argument is supplied with different values
 
 echo "\n--- Testing strtok() by supplying different values for 'token' argument ---\n";
 $counter = 1;
diff --git a/ext/standard/tests/strings/substr_replace_error.phpt b/ext/standard/tests/strings/substr_replace_error.phpt
index 7d3a695d4..fd314cbd9 100644
--- a/ext/standard/tests/strings/substr_replace_error.phpt
+++ b/ext/standard/tests/strings/substr_replace_error.phpt
@@ -26,7 +26,7 @@ echo "\n-- Testing substr_replace() function with start and length different typ
 var_dump(substr_replace($s1, "evening", array(5))); 
 var_dump(substr_replace($s1, "evening", 5, array(8))); 
   
-echo "\n-- Testing substr_replace() function with start and length with a different number of elments --\n";
+echo "\n-- Testing substr_replace() function with start and length with a different number of elements --\n";
 var_dump(substr_replace($s1, "evening", array(5, 1), array(8))); 
 
 echo "\n-- Testing substr_replace() function with start and length as arrays but string not--\n";
@@ -58,7 +58,7 @@ string(12) "Good morning"
 Warning: substr_replace(): 'from' and 'len' should be of same type - numerical or array  in %s on line %d
 string(12) "Good morning"
 
--- Testing substr_replace() function with start and length with a different number of elments --
+-- Testing substr_replace() function with start and length with a different number of elements --
 
 Warning: substr_replace(): 'from' and 'len' should have the same number of elements in %s on line %d
 string(12) "Good morning"
diff --git a/ext/standard/tests/strings/trim1.phpt b/ext/standard/tests/strings/trim1.phpt
index b9323afbd..dd52efd98 100644
--- a/ext/standard/tests/strings/trim1.phpt
+++ b/ext/standard/tests/strings/trim1.phpt
diff --git a/ext/standard/tests/strings/trim_error.phpt b/ext/standard/tests/strings/trim_error.phpt
index 092deb6dc..51dc848c9 100644
--- a/ext/standard/tests/strings/trim_error.phpt
+++ b/ext/standard/tests/strings/trim_error.phpt
@@ -4,7 +4,7 @@ Test trim() function : error conditions
 <?php
 
 /* Prototype  : string trim  ( string $str  [, string $charlist  ] )
- * Description: Strip whitespace (or other characters) from the begining and end of a string.
+ * Description: Strip whitespace (or other characters) from the beginning and end of a string.
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/trim_variation1.phpt b/ext/standard/tests/strings/trim_variation1.phpt
index 625ec3182..4ef40c680 100644
--- a/ext/standard/tests/strings/trim_variation1.phpt
+++ b/ext/standard/tests/strings/trim_variation1.phpt
@@ -4,7 +4,7 @@ Test trim() function : usage variations - test values for $str argument
 <?php
 
 /* Prototype  : string trim  ( string $str  [, string $charlist  ] )
- * Description: Strip whitespace (or other characters) from the begining and end of a string.
+ * Description: Strip whitespace (or other characters) from the beginning and end of a string.
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/trim_variation2.phpt b/ext/standard/tests/strings/trim_variation2.phpt
index 009d61b2d..11b2aaf1c 100644
--- a/ext/standard/tests/strings/trim_variation2.phpt
+++ b/ext/standard/tests/strings/trim_variation2.phpt
@@ -4,7 +4,7 @@ Test trim() function : usage variations - test values for $charlist argument
 <?php
 
 /* Prototype  : string trim  ( string $str  [, string $charlist  ] )
- * Description: Strip whitespace (or other characters) from the begining and end of a string.
+ * Description: Strip whitespace (or other characters) from the beginning and end of a string.
  * Source code: ext/standard/string.c
 */
 
diff --git a/ext/standard/tests/strings/ucfirst.phpt b/ext/standard/tests/strings/ucfirst.phpt
index bae40955d..468f7f034 100644
--- a/ext/standard/tests/strings/ucfirst.phpt
+++ b/ext/standard/tests/strings/ucfirst.phpt
diff --git a/ext/standard/tests/strings/ucwords_variation1.phpt b/ext/standard/tests/strings/ucwords_variation1.phpt
index 22c29163c..02edf0513 100644
--- a/ext/standard/tests/strings/ucwords_variation1.phpt
+++ b/ext/standard/tests/strings/ucwords_variation1.phpt
@@ -94,7 +94,7 @@ $values =  array (
 );
 
 // loop through each element of the array and check the working of ucwords()
-// when $str arugment is supplied with different values
+// when $str argument is supplied with different values
 echo "\n--- Testing ucwords() by supplying different values for 'str' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/ucwords_variation2.phpt b/ext/standard/tests/strings/ucwords_variation2.phpt
index ab6eb2f45..4c24d97a0 100644
--- a/ext/standard/tests/strings/ucwords_variation2.phpt
+++ b/ext/standard/tests/strings/ucwords_variation2.phpt
@@ -29,7 +29,7 @@ multiline string using
 heredoc
 EOT;
 
-// here doc with diferent whitespaces
+// here doc with different whitespaces
 $diff_whitespaces = <<<EOT
 testing\rucword(str)\twith
 multiline   string\t\tusing
diff --git a/ext/standard/tests/strings/wordwrap_variation1.phpt b/ext/standard/tests/strings/wordwrap_variation1.phpt
index d13e7dee2..28fc128bb 100644
--- a/ext/standard/tests/strings/wordwrap_variation1.phpt
+++ b/ext/standard/tests/strings/wordwrap_variation1.phpt
@@ -75,7 +75,7 @@ $values =  array (
 );
 
 // loop though each element of the array and check the working of wordwrap()
-// when $str arugment is supplied with different values
+// when $str argument is supplied with different values
 echo "\n--- Testing wordwrap() by supplying different values for 'str' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/wordwrap_variation2.phpt b/ext/standard/tests/strings/wordwrap_variation2.phpt
index 271879194..b914a2a81 100644
--- a/ext/standard/tests/strings/wordwrap_variation2.phpt
+++ b/ext/standard/tests/strings/wordwrap_variation2.phpt
@@ -73,7 +73,7 @@ $values =  array (
 
 
 // loop though each element of the array and check the working of wordwrap()
-// when $width arugment is supplied with different values
+// when $width argument is supplied with different values
 echo "\n--- Testing wordwrap() by supplying different values for 'width' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/wordwrap_variation3.phpt b/ext/standard/tests/strings/wordwrap_variation3.phpt
index 7d0c81670..ddf04c77c 100644
--- a/ext/standard/tests/strings/wordwrap_variation3.phpt
+++ b/ext/standard/tests/strings/wordwrap_variation3.phpt
@@ -75,7 +75,7 @@ $values =  array (
 );
 
 // loop though each element of the array and check the working of wordwrap()
-// when $break arugment is supplied with different values
+// when $break argument is supplied with different values
 echo "\n--- Testing wordwrap() by supplying different values for 'break' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/tests/strings/wordwrap_variation4.phpt b/ext/standard/tests/strings/wordwrap_variation4.phpt
index 440e93740..7111f2d2b 100644
--- a/ext/standard/tests/strings/wordwrap_variation4.phpt
+++ b/ext/standard/tests/strings/wordwrap_variation4.phpt
@@ -66,7 +66,7 @@ $values =  array (
 );
 
 // loop though each element of the array and check the working of wordwrap()
-// when $cut arugment is supplied with different values
+// when $cut argument is supplied with different values
 echo "\n--- Testing wordwrap() by supplying different values for 'cut' argument ---\n";
 $counter = 1;
 for($index = 0; $index < count($values); $index ++) {
diff --git a/ext/standard/url.c b/ext/standard/url.c
index 94f6638d6..190b4665e 100644
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -266,7 +266,7 @@ PHPAPI php_url *php_url_parse_ex(char const *str, int length)
 		p = s;
 	} else {
 		/* memrchr is a GNU specific extension
-		   Emulate for wide compatability */
+		   Emulate for wide compatibility */
 		for(p = e; *p != ':' && p >= s; p--);
 	}
 
diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c
index 2ceda1383..ae55d656d 100644
--- a/ext/standard/url_scanner_ex.c
+++ b/ext/standard/url_scanner_ex.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Tue Jan  1 16:28:14 2013 */
+/* Generated by re2c 0.13.5 */
 /*
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
@@ -717,139 +717,112 @@ state_val:
 {
 	YYCTYPE yych;
 	static const unsigned char yybm[] = {
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 160, 160, 248, 248, 160, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		160, 248,  56, 248, 248, 248, 248, 200, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248,   0, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
-		248, 248, 248, 248, 248, 248, 248, 248, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 192, 192, 224, 224, 192, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		192, 224,  64, 224, 224, 224, 224, 128, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224,   0, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
+		224, 224, 224, 224, 224, 224, 224, 224, 
 	};
-	if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	if (yych <= ' ') {
 		if (yych <= '\f') {
 			if (yych <= 0x08) goto yy63;
-			if (yych <= '\n') goto yy64;
+			if (yych <= '\n') goto yy65;
 			goto yy63;
 		} else {
-			if (yych <= '\r') goto yy64;
+			if (yych <= '\r') goto yy65;
 			if (yych <= 0x1F) goto yy63;
-			goto yy64;
+			goto yy65;
 		}
 	} else {
 		if (yych <= '&') {
 			if (yych != '"') goto yy63;
 		} else {
 			if (yych <= '\'') goto yy62;
-			if (yych == '>') goto yy64;
+			if (yych == '>') goto yy65;
 			goto yy63;
 		}
 	}
 	yych = *(YYMARKER = ++YYCURSOR);
-	goto yy77;
+	if (yych != '>') goto yy74;
 yy61:
-	{ handle_val(STD_ARGS, 0, ' '); goto state_next_arg_begin; }
+	{ passthru(STD_ARGS); goto state_next_arg_begin; }
 yy62:
 	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych == '>') goto yy61;
 	goto yy69;
 yy63:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
+	yych = *YYCURSOR;
 	goto yy67;
 yy64:
-	++YYCURSOR;
-	{ passthru(STD_ARGS); goto state_next_arg_begin; }
+	{ handle_val(STD_ARGS, 0, ' '); goto state_next_arg_begin; }
+yy65:
+	yych = *++YYCURSOR;
+	goto yy61;
 yy66:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 yy67:
-	if (yybm[0+yych] & 8) {
+	if (yybm[0+yych] & 32) {
 		goto yy66;
 	}
-	goto yy61;
+	goto yy64;
 yy68:
-	YYMARKER = ++YYCURSOR;
-	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-yy69:
-	if (yybm[0+yych] & 16) {
-		goto yy68;
-	}
-	if (yych <= '&') goto yy72;
-	if (yych >= '(') goto yy61;
-	++YYCURSOR;
-	if (yybm[0+(yych = *YYCURSOR)] & 8) {
-		goto yy66;
-	}
-yy71:
-	{ handle_val(STD_ARGS, 1, '\''); goto state_next_arg_begin; }
-yy72:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yybm[0+yych] & 32) {
-		goto yy72;
+yy69:
+	if (yybm[0+yych] & 64) {
+		goto yy68;
 	}
-	if (yych <= '=') goto yy75;
-yy74:
+	if (yych <= '=') goto yy71;
+yy70:
 	YYCURSOR = YYMARKER;
 	goto yy61;
-yy75:
-	yych = *++YYCURSOR;
-	goto yy71;
-yy76:
-	YYMARKER = ++YYCURSOR;
-	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
-	yych = *YYCURSOR;
-yy77:
-	if (yybm[0+yych] & 64) {
-		goto yy76;
-	}
-	if (yych <= '!') goto yy80;
-	if (yych >= '#') goto yy61;
+yy71:
 	++YYCURSOR;
-	if (yybm[0+(yych = *YYCURSOR)] & 8) {
-		goto yy66;
-	}
-yy79:
-	{ handle_val(STD_ARGS, 1, '"'); goto state_next_arg_begin; }
-yy80:
+	{ handle_val(STD_ARGS, 1, '\''); goto state_next_arg_begin; }
+yy73:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
+yy74:
 	if (yybm[0+yych] & 128) {
-		goto yy80;
+		goto yy73;
 	}
-	if (yych >= '>') goto yy74;
+	if (yych >= '>') goto yy70;
 	++YYCURSOR;
-	yych = *YYCURSOR;
-	goto yy79;
+	{ handle_val(STD_ARGS, 1, '"'); goto state_next_arg_begin; }
 }
 
 
diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re
index 760f725e9..ecacb76f9 100644
--- a/ext/standard/url_scanner_ex.re
+++ b/ext/standard/url_scanner_ex.re
@@ -317,7 +317,7 @@ state_next_arg_begin:
 state_next_arg:
 	start = YYCURSOR;
 /*!re2c
-  ">"		{ passthru(STD_ARGS); handle_form(STD_ARGS); goto state_plain_begin; }
+  [/]? [>]		{ passthru(STD_ARGS); handle_form(STD_ARGS); goto state_plain_begin; }
   [ \v\r\t\n]+	{ passthru(STD_ARGS); goto state_next_arg; }
   alpha		{ --YYCURSOR; STATE = STATE_ARG; goto state_arg; }
   any		{ passthru(STD_ARGS); goto state_plain_begin; }
@@ -343,7 +343,7 @@ state_val:
 /*!re2c
   ["] (any\[">])* ["]	{ handle_val(STD_ARGS, 1, '"'); goto state_next_arg_begin; }
   ['] (any\['>])* [']	{ handle_val(STD_ARGS, 1, '\''); goto state_next_arg_begin; }
-  (any\[ \r\t\n>])+	{ handle_val(STD_ARGS, 0, ' '); goto state_next_arg_begin; }
+  (any\[ \r\t\n>'"])+	{ handle_val(STD_ARGS, 0, ' '); goto state_next_arg_begin; }
   any					{ passthru(STD_ARGS); goto state_next_arg_begin; }
 */
 
@@ -463,7 +463,7 @@ static void php_url_scanner_output_handler(char *output, uint output_len, char *
 
 PHPAPI int php_url_scanner_add_var(char *name, int name_len, char *value, int value_len, int urlencode TSRMLS_DC)
 {
-	char *encoded;
+	char *encoded = NULL;
 	int encoded_len;
 	smart_str val;
 	
diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c
index b009e67aa..b44be124a 100644
--- a/ext/standard/user_filters.c
+++ b/ext/standard/user_filters.c
@@ -474,7 +474,7 @@ static void php_stream_bucket_attach(int append, INTERNAL_FUNCTION_PARAMETERS)
 	} else {
 		php_stream_bucket_prepend(brigade, bucket TSRMLS_CC);
 	}
-	/* This is a hack necessary to accomodate situations where bucket is appended to the stream
+	/* This is a hack necessary to accommodate situations where bucket is appended to the stream
  	 * multiple times. See bug35916.phpt for reference.
 	 */
 	if (bucket->refcount == 1) {
diff --git a/ext/standard/uuencode.c b/ext/standard/uuencode.c
index f0142ed04..76701ff24 100644
--- a/ext/standard/uuencode.c
+++ b/ext/standard/uuencode.c
@@ -70,7 +70,7 @@ PHPAPI int php_uuencode(char *src, int src_len, char **dest) /* {{{ */
 	int len = 45;
 	char *p, *s, *e, *ee;
 
-	/* encoded length is ~ 38% greater then the original */
+	/* encoded length is ~ 38% greater than the original */
 	p = *dest = safe_emalloc((size_t) ceil(src_len * 1.38), 1, 46);
 	s = src;
 	e = src + src_len;
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index d2f57b34f..136af2171 100644
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sat Mar  9 22:33:09 2013 */
+/* Generated by re2c 0.13.5 on Mon Jul 29 17:57:26 2013 */
 /*
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
@@ -25,6 +25,7 @@
 
 /* {{{ reference-handling for unserializer: var_* */
 #define VAR_ENTRIES_MAX 1024
+#define VAR_ENTRIES_DBG 0
 
 typedef struct {
 	zval *data[VAR_ENTRIES_MAX];
@@ -35,7 +36,7 @@ typedef struct {
 static inline void var_push(php_unserialize_data_t *var_hashx, zval **rval)
 {
 	var_entries *var_hash = (*var_hashx)->last;
-#if 0
+#if VAR_ENTRIES_DBG
 	fprintf(stderr, "var_push(%ld): %d\n", var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(rval));
 #endif
 
@@ -59,7 +60,7 @@ static inline void var_push(php_unserialize_data_t *var_hashx, zval **rval)
 PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval)
 {
 	var_entries *var_hash = (*var_hashx)->last_dtor;
-#if 0
+#if VAR_ENTRIES_DBG
 	fprintf(stderr, "var_push_dtor(%ld): %d\n", var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(rval));
 #endif
 
@@ -81,11 +82,35 @@ PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval)
 	var_hash->data[var_hash->used_slots++] = *rval;
 }
 
+PHPAPI void var_push_dtor_no_addref(php_unserialize_data_t *var_hashx, zval **rval)
+{
+	var_entries *var_hash = (*var_hashx)->last_dtor;
+#if VAR_ENTRIES_DBG
+	fprintf(stderr, "var_push_dtor_no_addref(%ld): %d (%d)\n", var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(rval), Z_REFCOUNT_PP(rval));
+#endif
+
+	if (!var_hash || var_hash->used_slots == VAR_ENTRIES_MAX) {
+		var_hash = emalloc(sizeof(var_entries));
+		var_hash->used_slots = 0;
+		var_hash->next = 0;
+
+		if (!(*var_hashx)->first_dtor) {
+			(*var_hashx)->first_dtor = var_hash;
+		} else {
+			((var_entries *) (*var_hashx)->last_dtor)->next = var_hash;
+		}
+
+		(*var_hashx)->last_dtor = var_hash;
+	}
+
+	var_hash->data[var_hash->used_slots++] = *rval;
+}
+
 PHPAPI void var_replace(php_unserialize_data_t *var_hashx, zval *ozval, zval **nzval)
 {
 	long i;
 	var_entries *var_hash = (*var_hashx)->first;
-#if 0
+#if VAR_ENTRIES_DBG
 	fprintf(stderr, "var_replace(%ld): %d\n", var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(nzval));
 #endif
 	
@@ -103,7 +128,7 @@ PHPAPI void var_replace(php_unserialize_data_t *var_hashx, zval *ozval, zval **n
 static int var_access(php_unserialize_data_t *var_hashx, long id, zval ***store)
 {
 	var_entries *var_hash = (*var_hashx)->first;
-#if 0
+#if VAR_ENTRIES_DBG
 	fprintf(stderr, "var_access(%ld): %ld\n", var_hash?var_hash->used_slots:-1L, id);
 #endif
 		
@@ -126,7 +151,7 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
 	void *next;
 	long i;
 	var_entries *var_hash = (*var_hashx)->first;
-#if 0
+#if VAR_ENTRIES_DBG
 	fprintf(stderr, "var_destroy(%ld)\n", var_hash?var_hash->used_slots:-1L);
 #endif
 	
@@ -617,9 +642,9 @@ yy20:
 
 	do {
 		/* Try to find class directly */
-		BG(serialize_lock) = 1;
+		BG(serialize_lock)++;
 		if (zend_lookup_class(class_name, len2, &pce TSRMLS_CC) == SUCCESS) {
-			BG(serialize_lock) = 0;
+			BG(serialize_lock)--;
 			if (EG(exception)) {
 				efree(class_name);
 				return 0;
@@ -627,7 +652,7 @@ yy20:
 			ce = *pce;
 			break;
 		}
-		BG(serialize_lock) = 0;
+		BG(serialize_lock)--;
 
 		if (EG(exception)) {
 			efree(class_name);
@@ -647,9 +672,9 @@ yy20:
 		args[0] = &arg_func_name;
 		MAKE_STD_ZVAL(arg_func_name);
 		ZVAL_STRING(arg_func_name, class_name, 1);
-		BG(serialize_lock) = 1;
+		BG(serialize_lock)++;
 		if (call_user_function_ex(CG(function_table), NULL, user_func, &retval_ptr, 1, args, 0, NULL TSRMLS_CC) != SUCCESS) {
-			BG(serialize_lock) = 0;
+			BG(serialize_lock)--;
 			if (EG(exception)) {
 				efree(class_name);
 				zval_ptr_dtor(&user_func);
@@ -663,7 +688,7 @@ yy20:
 			zval_ptr_dtor(&arg_func_name);
 			break;
 		}
-		BG(serialize_lock) = 0;
+		BG(serialize_lock)--;
 		if (retval_ptr) {
 			zval_ptr_dtor(&retval_ptr);
 		}
@@ -691,7 +716,9 @@ yy20:
 	*p = YYCURSOR;
 
 	if (custom_object) {
-		int ret = object_custom(UNSERIALIZE_PASSTHRU, ce);
+		int ret;
+
+		ret = object_custom(UNSERIALIZE_PASSTHRU, ce);
 
 		if (ret && incomplete_class) {
 			php_store_class_name(*rval, class_name, len2);
@@ -1151,7 +1178,7 @@ yy91:
 	if (*rval == *rval_ref) return 0;
 
 	if (*rval != NULL) {
-		zval_ptr_dtor(rval);
+		var_push_dtor_no_addref(var_hash, rval);
 	}
 	*rval = *rval_ref;
 	Z_ADDREF_PP(rval);
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index 4d99cbfd7..76c501e1b 100644
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -24,6 +24,7 @@
 
 /* {{{ reference-handling for unserializer: var_* */
 #define VAR_ENTRIES_MAX 1024
+#define VAR_ENTRIES_DBG 0
 
 typedef struct {
 	zval *data[VAR_ENTRIES_MAX];
@@ -34,7 +35,7 @@ typedef struct {
 static inline void var_push(php_unserialize_data_t *var_hashx, zval **rval)
 {
 	var_entries *var_hash = (*var_hashx)->last;
-#if 0
+#if VAR_ENTRIES_DBG
 	fprintf(stderr, "var_push(%ld): %d\n", var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(rval));
 #endif
 
@@ -58,7 +59,7 @@ static inline void var_push(php_unserialize_data_t *var_hashx, zval **rval)
 PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval)
 {
 	var_entries *var_hash = (*var_hashx)->last_dtor;
-#if 0
+#if VAR_ENTRIES_DBG
 	fprintf(stderr, "var_push_dtor(%ld): %d\n", var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(rval));
 #endif
 
@@ -80,11 +81,35 @@ PHPAPI void var_push_dtor(php_unserialize_data_t *var_hashx, zval **rval)
 	var_hash->data[var_hash->used_slots++] = *rval;
 }
 
+PHPAPI void var_push_dtor_no_addref(php_unserialize_data_t *var_hashx, zval **rval)
+{
+	var_entries *var_hash = (*var_hashx)->last_dtor;
+#if VAR_ENTRIES_DBG
+	fprintf(stderr, "var_push_dtor_no_addref(%ld): %d (%d)\n", var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(rval), Z_REFCOUNT_PP(rval));
+#endif
+
+	if (!var_hash || var_hash->used_slots == VAR_ENTRIES_MAX) {
+		var_hash = emalloc(sizeof(var_entries));
+		var_hash->used_slots = 0;
+		var_hash->next = 0;
+
+		if (!(*var_hashx)->first_dtor) {
+			(*var_hashx)->first_dtor = var_hash;
+		} else {
+			((var_entries *) (*var_hashx)->last_dtor)->next = var_hash;
+		}
+
+		(*var_hashx)->last_dtor = var_hash;
+	}
+
+	var_hash->data[var_hash->used_slots++] = *rval;
+}
+
 PHPAPI void var_replace(php_unserialize_data_t *var_hashx, zval *ozval, zval **nzval)
 {
 	long i;
 	var_entries *var_hash = (*var_hashx)->first;
-#if 0
+#if VAR_ENTRIES_DBG
 	fprintf(stderr, "var_replace(%ld): %d\n", var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(nzval));
 #endif
 	
@@ -102,7 +127,7 @@ PHPAPI void var_replace(php_unserialize_data_t *var_hashx, zval *ozval, zval **n
 static int var_access(php_unserialize_data_t *var_hashx, long id, zval ***store)
 {
 	var_entries *var_hash = (*var_hashx)->first;
-#if 0
+#if VAR_ENTRIES_DBG
 	fprintf(stderr, "var_access(%ld): %ld\n", var_hash?var_hash->used_slots:-1L, id);
 #endif
 		
@@ -125,7 +150,7 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
 	void *next;
 	long i;
 	var_entries *var_hash = (*var_hashx)->first;
-#if 0
+#if VAR_ENTRIES_DBG
 	fprintf(stderr, "var_destroy(%ld)\n", var_hash?var_hash->used_slots:-1L);
 #endif
 	
@@ -472,7 +497,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
 	if (*rval == *rval_ref) return 0;
 
 	if (*rval != NULL) {
-		zval_ptr_dtor(rval);
+		var_push_dtor_no_addref(var_hash, rval);
 	}
 	*rval = *rval_ref;
 	Z_ADDREF_PP(rval);
@@ -683,9 +708,9 @@ object ":" uiv ":" ["]	{
 
 	do {
 		/* Try to find class directly */
-		BG(serialize_lock) = 1;
+		BG(serialize_lock)++;
 		if (zend_lookup_class(class_name, len2, &pce TSRMLS_CC) == SUCCESS) {
-			BG(serialize_lock) = 0;
+			BG(serialize_lock)--;
 			if (EG(exception)) {
 				efree(class_name);
 				return 0;
@@ -693,7 +718,7 @@ object ":" uiv ":" ["]	{
 			ce = *pce;
 			break;
 		}
-		BG(serialize_lock) = 0;
+		BG(serialize_lock)--;
 
 		if (EG(exception)) {
 			efree(class_name);
@@ -713,9 +738,9 @@ object ":" uiv ":" ["]	{
 		args[0] = &arg_func_name;
 		MAKE_STD_ZVAL(arg_func_name);
 		ZVAL_STRING(arg_func_name, class_name, 1);
-		BG(serialize_lock) = 1;
+		BG(serialize_lock)++;
 		if (call_user_function_ex(CG(function_table), NULL, user_func, &retval_ptr, 1, args, 0, NULL TSRMLS_CC) != SUCCESS) {
-			BG(serialize_lock) = 0;
+			BG(serialize_lock)--;
 			if (EG(exception)) {
 				efree(class_name);
 				zval_ptr_dtor(&user_func);
@@ -729,7 +754,7 @@ object ":" uiv ":" ["]	{
 			zval_ptr_dtor(&arg_func_name);
 			break;
 		}
-		BG(serialize_lock) = 0;
+		BG(serialize_lock)--;
 		if (retval_ptr) {
 			zval_ptr_dtor(&retval_ptr);
 		}
@@ -757,7 +782,9 @@ object ":" uiv ":" ["]	{
 	*p = YYCURSOR;
 
 	if (custom_object) {
-		int ret = object_custom(UNSERIALIZE_PASSTHRU, ce);
+		int ret;
+
+		ret = object_custom(UNSERIALIZE_PASSTHRU, ce);
 
 		if (ret && incomplete_class) {
 			php_store_class_name(*rval, class_name, len2);
diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index bd4cf1429..ee53d484c 100644
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -1121,7 +1121,7 @@ static int php_sybase_finish_results(sybase_result *result TSRMLS_DC)
 				break;
 
 			case CS_CMD_FAIL:
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:  Command failed, cancelling rest");
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:  Command failed, canceling rest");
 				ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_ALL);
 				fail = 1;
 				break;
@@ -1131,7 +1131,7 @@ static int php_sybase_finish_results(sybase_result *result TSRMLS_DC)
 			case CS_PARAM_RESULT:
 			case CS_ROW_RESULT:
 				/* Unexpected results, cancel them. */
-				php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase:  Unexpected results, cancelling current");
+				php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase:  Unexpected results, canceling current");
 				ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_CURRENT);
 				break;
 
@@ -1141,7 +1141,7 @@ static int php_sybase_finish_results(sybase_result *result TSRMLS_DC)
 				break;
 
 			default:
-				php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase:  Unexpected results, cancelling all");
+				php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Sybase:  Unexpected results, canceling all");
 				ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_ALL);
 				break;
 		}
@@ -1696,7 +1696,7 @@ PHP_FUNCTION(sybase_free_result)
 	
 	/* Did we fetch up until the end? */
 	if (result->last_retcode != CS_END_DATA && result->last_retcode != CS_END_RESULTS) {
-		/* php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:  Cancelling the rest of the results"); */
+		/* php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase:  canceling the rest of the results"); */
 		ct_cancel(NULL, result->sybase_ptr->cmd, CS_CANCEL_ALL);
 		php_sybase_finish_results(result TSRMLS_CC);
 	}
diff --git a/ext/sybase_ct/tests/bug26407.phpt b/ext/sybase_ct/tests/bug26407.phpt
index 35bf6df7a..27f5f99b9 100644
--- a/ext/sybase_ct/tests/bug26407.phpt
+++ b/ext/sybase_ct/tests/bug26407.phpt
@@ -80,7 +80,7 @@ bool(true)
     select "bar"   
   
 
-Notice: sybase_query(): Sybase:  Unexpected results, cancelling current in %stest.inc on line %d
+Notice: sybase_query(): Sybase:  Unexpected results, canceling current in %stest.inc on line %d
 <<< Return: resource
 array(1) {
   [0]=>
diff --git a/ext/sybase_ct/tests/bug43578.phpt b/ext/sybase_ct/tests/bug43578.phpt
index e840402ed..9f75b9c0e 100644
--- a/ext/sybase_ct/tests/bug43578.phpt
+++ b/ext/sybase_ct/tests/bug43578.phpt
@@ -23,7 +23,7 @@ Sybase-CT bug #43578 (Incurred fault #6 - if returned textfield ist empty)
   var_dump(sybase_query('insert into #Resource values (123, NULL)', $db));
   var_dump(sybase_query('insert into #Resource values (124, "")', $db));
 
-  // Select non-existant
+  // Select non-existent
   var_dump(sybase_select_ex($db, 'select DC_Rights from #Resource where Resource_ID = 122'));
 
   // Select null
diff --git a/ext/sybase_ct/tests/test_fetch_object.phpt b/ext/sybase_ct/tests/test_fetch_object.phpt
index c23658fa3..2d225cd9c 100644
--- a/ext/sybase_ct/tests/test_fetch_object.phpt
+++ b/ext/sybase_ct/tests/test_fetch_object.phpt
@@ -40,7 +40,7 @@ Sybase-CT sybase_fetch_object
   // Test with object
   var_export(fetch_object($db, new article())); echo "\n";
 
-  // Test with non-existant class
+  // Test with non-existent class
   var_export(fetch_object($db, '***')); echo "\n";
     
   sybase_close($db);
diff --git a/ext/sybase_ct/tests/test_msghandler.phpt b/ext/sybase_ct/tests/test_msghandler.phpt
index afe97cbef..3189aaac2 100644
--- a/ext/sybase_ct/tests/test_msghandler.phpt
+++ b/ext/sybase_ct/tests/test_msghandler.phpt
@@ -13,7 +13,7 @@ Sybase-CT server message handler
   
   $db= sybase_connect_ex();
 
-  echo 'Nonexistant:     '; sybase_set_messagehandler_ex('function_does_not_exist');
+  echo 'Nonexistent:     '; sybase_set_messagehandler_ex('function_does_not_exist');
   echo 'Static method:   '; sybase_set_messagehandler_ex(array('sybase', 'static_handler'));
   echo 'Instance method: '; sybase_set_messagehandler_ex(array(new sybase(), 'handler'));
   echo 'Lambda function: '; sybase_set_messagehandler_ex(create_function('', 'return FALSE;'));
@@ -25,7 +25,7 @@ Sybase-CT server message handler
   sybase_close($db);
 ?>
 --EXPECTF--
-Nonexistant:     
+Nonexistent:     
 Warning: sybase_set_message_handler() expects parameter 1 to be a valid callback, function 'function_does_not_exist' not found or invalid function name in %stest.inc on line %d
 NULL
 Static method:   bool(true)
diff --git a/ext/sysvmsg/sysvmsg.c b/ext/sysvmsg/sysvmsg.c
index e268047b6..a57e25e6c 100644
--- a/ext/sysvmsg/sysvmsg.c
+++ b/ext/sysvmsg/sysvmsg.c
@@ -228,7 +228,7 @@ PHP_FUNCTION(msg_stat_queue)
 
 
 /* {{{ proto bool msg_queue_exists(int key)
-   Check wether a message queue exists */
+   Check whether a message queue exists */
 PHP_FUNCTION(msg_queue_exists)
 {
 	long key;
diff --git a/ext/sysvsem/tests/sysv.phpt b/ext/sysvsem/tests/sysv.phpt
index 3a962be31..6f52f3bd7 100644
--- a/ext/sysvsem/tests/sysv.phpt
+++ b/ext/sysvsem/tests/sysv.phpt
@@ -23,11 +23,11 @@ echo "Got semaphore $sem_id.\n";
 
 // Accuire semaphore
 if (! sem_acquire($sem_id)) {
-	echo "Fail to aquire semaphore $sem_id.\n";
+	echo "Fail to acquire semaphore $sem_id.\n";
 	sem_remove($sem_id);
 	exit;
 }
-echo "Success aquire semaphore $sem_id.\n";
+echo "Success acquire semaphore $sem_id.\n";
 
 $shm_id =   shm_attach($SHMKEY, $MEMSIZE);
 if ($shm_id === FALSE) {
@@ -100,7 +100,7 @@ echo "End.\n";
 --EXPECTF--
 Start.
 Got semaphore Resource id #%i.
-Success aquire semaphore Resource id #%i.
+Success acquire semaphore Resource id #%i.
 Success to attach shared memory : %s.
 Write var1 to shared memory.
 Write var2 to shared memory.
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 5cfb16456..c3b9d8c34 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -1443,7 +1443,7 @@ static PHP_FUNCTION(tidy_get_config)
 /* }}} */
 
 /* {{{ proto int tidy_get_status()
-   Get status of specfied document. */
+   Get status of specified document. */
 static PHP_FUNCTION(tidy_get_status)
 {
 	TIDY_FETCH_OBJECT;
diff --git a/ext/xml/compat.c b/ext/xml/compat.c
index fbebb635e..c2d4497ba 100644
--- a/ext/xml/compat.c
+++ b/ext/xml/compat.c
@@ -619,109 +619,109 @@ XML_GetErrorCode(XML_Parser parser)
 }
 
 static const XML_Char *const error_mapping[] = {
-	"No error",
-	"No memory",
-	"Invalid document start",
-	"Empty document",
-	"Not well-formed (invalid token)",
-	"Invalid document end",
-	"Invalid hexadecimal character reference",
-	"Invalid decimal character reference",
-	"Invalid character reference",
-	"Invalid character",
-	"XML_ERR_CHARREF_AT_EOF",
-	"XML_ERR_CHARREF_IN_PROLOG",
-	"XML_ERR_CHARREF_IN_EPILOG",
-	"XML_ERR_CHARREF_IN_DTD",
-	"XML_ERR_ENTITYREF_AT_EOF",
-	"XML_ERR_ENTITYREF_IN_PROLOG",
-	"XML_ERR_ENTITYREF_IN_EPILOG",
-	"XML_ERR_ENTITYREF_IN_DTD",
-	"PEReference at end of document",
-	"PEReference in prolog",
-	"PEReference in epilog",
-	"PEReference: forbidden within markup decl in internal subset",
-	"XML_ERR_ENTITYREF_NO_NAME",
-	"EntityRef: expecting ';'",
-	"PEReference: no name",
-	"PEReference: expecting ';'",
-	"Undeclared entity error",
-	"Undeclared entity warning",
-	"Unparsed Entity",
-	"XML_ERR_ENTITY_IS_EXTERNAL",
-	"XML_ERR_ENTITY_IS_PARAMETER",
-	"Unknown encoding",
-	"Unsupported encoding",
-	"String not started expecting ' or \"",
-	"String not closed expecting \" or '",
-	"Namespace declaration error",
-	"EntityValue: \" or ' expected",
-	"EntityValue: \" or ' expected",
-	"< in attribute",
-	"Attribute not started",
-	"Attribute not finished",
-	"Attribute without value",
-	"Attribute redefined",
-	"SystemLiteral \" or ' expected",
-	"SystemLiteral \" or ' expected",
-	/* "XML_ERR_COMMENT_NOT_STARTED", <= eliminated on purpose */
-	"Comment not finished",
-	"Processing Instruction not started",
-	"Processing Instruction not finished",
-	"NOTATION: Name expected here",
-	"'>' required to close NOTATION declaration",
-	"'(' required to start ATTLIST enumeration",
-	"'(' required to start ATTLIST enumeration",
-	"MixedContentDecl : '|' or ')*' expected",
-	"XML_ERR_MIXED_NOT_FINISHED",
-	"ELEMENT in DTD not started",
-	"ELEMENT in DTD not finished",
-	"XML declaration not started",
-	"XML declaration not finished",
-	"XML_ERR_CONDSEC_NOT_STARTED",
-	"XML conditional section not closed",
-	"Content error in the external subset",
-	"DOCTYPE not finished",
-	"Sequence ']]>' not allowed in content",
-	"CDATA not finished",
-	"Reserved XML Name",
-	"Space required",
-	"XML_ERR_SEPARATOR_REQUIRED",
-	"NmToken expected in ATTLIST enumeration",
-	"XML_ERR_NAME_REQUIRED",
-	"MixedContentDecl : '#PCDATA' expected",
-	"SYSTEM or PUBLIC, the URI is missing",
-	"PUBLIC, the Public Identifier is missing",
-	"< required",
-	"> required",
-	"</ required",
-	"= required",
-	"Mismatched tag",
-	"Tag not finished",
-	"standalone accepts only 'yes' or 'no'",
-	"Invalid XML encoding name",
-	"Comment must not contain '--' (double-hyphen)",
-	"Invalid encoding",
-	"external parsed entities cannot be standalone",
-	"XML conditional section '[' expected",
-	"Entity value required",
-	"chunk is not well balanced",
-	"extra content at the end of well balanced chunk",
-    "XML_ERR_ENTITY_CHAR_ERROR",
-    "PEReferences forbidden in internal subset",
-    "Detected an entity reference loop",
-    "XML_ERR_ENTITY_BOUNDARY",
-    "Invalid URI",
-    "Fragment not allowed",
-    "XML_WAR_CATALOG_PI",
-    "XML_ERR_NO_DTD",
-    "conditional section INCLUDE or IGNORE keyword expected", /* 95 */
-    "Version in XML Declaration missing", /* 96 */
-    "XML_WAR_UNKNOWN_VERSION", /* 97 */
-    "XML_WAR_LANG_VALUE", /* 98 */
-    "XML_WAR_NS_URI", /* 99 */
-    "XML_WAR_NS_URI_RELATIVE", /* 100 */
-    "Missing encoding in text declaration" /* 101 */
+	(const XML_Char *)"No error",
+	(const XML_Char *)"No memory",
+	(const XML_Char *)"Invalid document start",
+	(const XML_Char *)"Empty document",
+	(const XML_Char *)"Not well-formed (invalid token)",
+	(const XML_Char *)"Invalid document end",
+	(const XML_Char *)"Invalid hexadecimal character reference",
+	(const XML_Char *)"Invalid decimal character reference",
+	(const XML_Char *)"Invalid character reference",
+	(const XML_Char *)"Invalid character",
+	(const XML_Char *)"XML_ERR_CHARREF_AT_EOF",
+	(const XML_Char *)"XML_ERR_CHARREF_IN_PROLOG",
+	(const XML_Char *)"XML_ERR_CHARREF_IN_EPILOG",
+	(const XML_Char *)"XML_ERR_CHARREF_IN_DTD",
+	(const XML_Char *)"XML_ERR_ENTITYREF_AT_EOF",
+	(const XML_Char *)"XML_ERR_ENTITYREF_IN_PROLOG",
+	(const XML_Char *)"XML_ERR_ENTITYREF_IN_EPILOG",
+	(const XML_Char *)"XML_ERR_ENTITYREF_IN_DTD",
+	(const XML_Char *)"PEReference at end of document",
+	(const XML_Char *)"PEReference in prolog",
+	(const XML_Char *)"PEReference in epilog",
+	(const XML_Char *)"PEReference: forbidden within markup decl in internal subset",
+	(const XML_Char *)"XML_ERR_ENTITYREF_NO_NAME",
+	(const XML_Char *)"EntityRef: expecting ';'",
+	(const XML_Char *)"PEReference: no name",
+	(const XML_Char *)"PEReference: expecting ';'",
+	(const XML_Char *)"Undeclared entity error",
+	(const XML_Char *)"Undeclared entity warning",
+	(const XML_Char *)"Unparsed Entity",
+	(const XML_Char *)"XML_ERR_ENTITY_IS_EXTERNAL",
+	(const XML_Char *)"XML_ERR_ENTITY_IS_PARAMETER",
+	(const XML_Char *)"Unknown encoding",
+	(const XML_Char *)"Unsupported encoding",
+	(const XML_Char *)"String not started expecting ' or \"",
+	(const XML_Char *)"String not closed expecting \" or '",
+	(const XML_Char *)"Namespace declaration error",
+	(const XML_Char *)"EntityValue: \" or ' expected",
+	(const XML_Char *)"EntityValue: \" or ' expected",
+	(const XML_Char *)"< in attribute",
+	(const XML_Char *)"Attribute not started",
+	(const XML_Char *)"Attribute not finished",
+	(const XML_Char *)"Attribute without value",
+	(const XML_Char *)"Attribute redefined",
+	(const XML_Char *)"SystemLiteral \" or ' expected",
+	(const XML_Char *)"SystemLiteral \" or ' expected",
+	/* (const XML_Char *)"XML_ERR_COMMENT_NOT_STARTED", <= eliminated on purpose */
+	(const XML_Char *)"Comment not finished",
+	(const XML_Char *)"Processing Instruction not started",
+	(const XML_Char *)"Processing Instruction not finished",
+	(const XML_Char *)"NOTATION: Name expected here",
+	(const XML_Char *)"'>' required to close NOTATION declaration",
+	(const XML_Char *)"'(' required to start ATTLIST enumeration",
+	(const XML_Char *)"'(' required to start ATTLIST enumeration",
+	(const XML_Char *)"MixedContentDecl : '|' or ')*' expected",
+	(const XML_Char *)"XML_ERR_MIXED_NOT_FINISHED",
+	(const XML_Char *)"ELEMENT in DTD not started",
+	(const XML_Char *)"ELEMENT in DTD not finished",
+	(const XML_Char *)"XML declaration not started",
+	(const XML_Char *)"XML declaration not finished",
+	(const XML_Char *)"XML_ERR_CONDSEC_NOT_STARTED",
+	(const XML_Char *)"XML conditional section not closed",
+	(const XML_Char *)"Content error in the external subset",
+	(const XML_Char *)"DOCTYPE not finished",
+	(const XML_Char *)"Sequence ']]>' not allowed in content",
+	(const XML_Char *)"CDATA not finished",
+	(const XML_Char *)"Reserved XML Name",
+	(const XML_Char *)"Space required",
+	(const XML_Char *)"XML_ERR_SEPARATOR_REQUIRED",
+	(const XML_Char *)"NmToken expected in ATTLIST enumeration",
+	(const XML_Char *)"XML_ERR_NAME_REQUIRED",
+	(const XML_Char *)"MixedContentDecl : '#PCDATA' expected",
+	(const XML_Char *)"SYSTEM or PUBLIC, the URI is missing",
+	(const XML_Char *)"PUBLIC, the Public Identifier is missing",
+	(const XML_Char *)"< required",
+	(const XML_Char *)"> required",
+	(const XML_Char *)"</ required",
+	(const XML_Char *)"= required",
+	(const XML_Char *)"Mismatched tag",
+	(const XML_Char *)"Tag not finished",
+	(const XML_Char *)"standalone accepts only 'yes' or 'no'",
+	(const XML_Char *)"Invalid XML encoding name",
+	(const XML_Char *)"Comment must not contain '--' (double-hyphen)",
+	(const XML_Char *)"Invalid encoding",
+	(const XML_Char *)"external parsed entities cannot be standalone",
+	(const XML_Char *)"XML conditional section '[' expected",
+	(const XML_Char *)"Entity value required",
+	(const XML_Char *)"chunk is not well balanced",
+	(const XML_Char *)"extra content at the end of well balanced chunk",
+    (const XML_Char *)"XML_ERR_ENTITY_CHAR_ERROR",
+    (const XML_Char *)"PEReferences forbidden in internal subset",
+    (const XML_Char *)"Detected an entity reference loop",
+    (const XML_Char *)"XML_ERR_ENTITY_BOUNDARY",
+    (const XML_Char *)"Invalid URI",
+    (const XML_Char *)"Fragment not allowed",
+    (const XML_Char *)"XML_WAR_CATALOG_PI",
+    (const XML_Char *)"XML_ERR_NO_DTD",
+    (const XML_Char *)"conditional section INCLUDE or IGNORE keyword expected", /* 95 */
+    (const XML_Char *)"Version in XML Declaration missing", /* 96 */
+    (const XML_Char *)"XML_WAR_UNKNOWN_VERSION", /* 97 */
+    (const XML_Char *)"XML_WAR_LANG_VALUE", /* 98 */
+    (const XML_Char *)"XML_WAR_NS_URI", /* 99 */
+    (const XML_Char *)"XML_WAR_NS_URI_RELATIVE", /* 100 */
+    (const XML_Char *)"Missing encoding in text declaration" /* 101 */
 };
 
 PHPAPI const XML_Char *
diff --git a/ext/xml/tests/bug65236.phpt b/ext/xml/tests/bug65236.phpt
new file mode 100644
index 000000000..67b26d663
--- /dev/null
+++ b/ext/xml/tests/bug65236.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Bug #65236 (heap corruption in xml parser)
+--SKIPIF--
+<?php
+require_once("skipif.inc");
+?>
+--FILE--
+<?php
+xml_parse_into_struct(xml_parser_create_ns(), str_repeat("<blah>", 1000), $a);
+
+echo "Done\n";
+?>
+--EXPECTF--
+Warning: xml_parse_into_struct(): Maximum depth exceeded - Results truncated in %s on line %d
+Done
diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 2fea4f8ab..1ef01c886 100644
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -274,10 +274,10 @@ zend_module_entry xml_module_entry = {
  * the encoding is currently done internally by expat/xmltok.
  */
 xml_encoding xml_encodings[] = {
-	{ "ISO-8859-1", xml_decode_iso_8859_1, xml_encode_iso_8859_1 },
-	{ "US-ASCII",   xml_decode_us_ascii,   xml_encode_us_ascii   },
-	{ "UTF-8",      NULL,                  NULL                  },
-	{ NULL,         NULL,                  NULL                  }
+	{ (XML_Char *)"ISO-8859-1", xml_decode_iso_8859_1, xml_encode_iso_8859_1 },
+	{ (XML_Char *)"US-ASCII",   xml_decode_us_ascii,   xml_encode_us_ascii   },
+	{ (XML_Char *)"UTF-8",      NULL,                  NULL                  },
+	{ (XML_Char *)NULL,         NULL,                  NULL                  }
 };
 
 static XML_Memory_Handling_Suite php_xml_mem_hdlrs;
@@ -428,7 +428,7 @@ static void xml_parser_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 	}
 	if (parser->ltags) {
 		int inx;
-		for (inx = 0; inx < parser->level; inx++)
+		for (inx = 0; ((inx < parser->level) && (inx < XML_MAXLEVEL)); inx++)
 			efree(parser->ltags[ inx ]);
 		efree(parser->ltags);
 	}
@@ -805,45 +805,50 @@ void _xml_startElementHandler(void *userData, const XML_Char *name, const XML_Ch
 		} 
 
 		if (parser->data) {
-			zval *tag, *atr;
-			int atcnt = 0;
+			if (parser->level <= XML_MAXLEVEL)  {
+				zval *tag, *atr;
+				int atcnt = 0;
 
-			MAKE_STD_ZVAL(tag);
-			MAKE_STD_ZVAL(atr);
+				MAKE_STD_ZVAL(tag);
+				MAKE_STD_ZVAL(atr);
 
-			array_init(tag);
-			array_init(atr);
+				array_init(tag);
+				array_init(atr);
 
-			_xml_add_to_info(parser,((char *) tag_name) + parser->toffset);
+				_xml_add_to_info(parser,((char *) tag_name) + parser->toffset);
 
-			add_assoc_string(tag,"tag",((char *) tag_name) + parser->toffset,1); /* cast to avoid gcc-warning */
-			add_assoc_string(tag,"type","open",1);
-			add_assoc_long(tag,"level",parser->level);
+				add_assoc_string(tag,"tag",((char *) tag_name) + parser->toffset,1); /* cast to avoid gcc-warning */
+				add_assoc_string(tag,"type","open",1);
+				add_assoc_long(tag,"level",parser->level);
 
-			parser->ltags[parser->level-1] = estrdup(tag_name);
-			parser->lastwasopen = 1;
+				parser->ltags[parser->level-1] = estrdup(tag_name);
+				parser->lastwasopen = 1;
 
-			attributes = (const XML_Char **) attrs;
+				attributes = (const XML_Char **) attrs;
 
-			while (attributes && *attributes) {
-				att = _xml_decode_tag(parser, attributes[0]);
-				val = xml_utf8_decode(attributes[1], strlen(attributes[1]), &val_len, parser->target_encoding);
-				
-				add_assoc_stringl(atr,att,val,val_len,0);
+				while (attributes && *attributes) {
+					att = _xml_decode_tag(parser, attributes[0]);
+					val = xml_utf8_decode(attributes[1], strlen(attributes[1]), &val_len, parser->target_encoding);
 
-				atcnt++;
-				attributes += 2;
+					add_assoc_stringl(atr,att,val,val_len,0);
 
-				efree(att);
-			}
+					atcnt++;
+					attributes += 2;
 
-			if (atcnt) {
-				zend_hash_add(Z_ARRVAL_P(tag),"attributes",sizeof("attributes"),&atr,sizeof(zval*),NULL);
-			} else {
-				zval_ptr_dtor(&atr);
-			}
+					efree(att);
+				}
+
+				if (atcnt) {
+					zend_hash_add(Z_ARRVAL_P(tag),"attributes",sizeof("attributes"),&atr,sizeof(zval*),NULL);
+				} else {
+					zval_ptr_dtor(&atr);
+				}
 
-			zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),(void *) &parser->ctag);
+				zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),(void *) &parser->ctag);
+			} else if (parser->level == (XML_MAXLEVEL + 1)) {
+				TSRMLS_FETCH();
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Maximum depth exceeded - Results truncated");
+			}
 		}
 
 		efree(tag_name);
@@ -895,7 +900,7 @@ void _xml_endElementHandler(void *userData, const XML_Char *name)
 
 		efree(tag_name);
 
-		if (parser->ltags) {
+		if ((parser->ltags) && (parser->level <= XML_MAXLEVEL)) {
 			efree(parser->ltags[parser->level-1]);
 		}
 
@@ -979,18 +984,23 @@ void _xml_characterDataHandler(void *userData, const XML_Char *s, int len)
 						}
 					}
 
-					MAKE_STD_ZVAL(tag);
-					
-					array_init(tag);
-					
-					_xml_add_to_info(parser,parser->ltags[parser->level-1] + parser->toffset);
+					if (parser->level <= XML_MAXLEVEL) {
+						MAKE_STD_ZVAL(tag);
+
+						array_init(tag);
 
-					add_assoc_string(tag,"tag",parser->ltags[parser->level-1] + parser->toffset,1);
-					add_assoc_string(tag,"value",decoded_value,0);
-					add_assoc_string(tag,"type","cdata",1);
-					add_assoc_long(tag,"level",parser->level);
+						_xml_add_to_info(parser,parser->ltags[parser->level-1] + parser->toffset);
 
-					zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),NULL);
+						add_assoc_string(tag,"tag",parser->ltags[parser->level-1] + parser->toffset,1);
+						add_assoc_string(tag,"value",decoded_value,0);
+						add_assoc_string(tag,"type","cdata",1);
+						add_assoc_long(tag,"level",parser->level);
+
+						zend_hash_next_index_insert(Z_ARRVAL_P(parser->data),&tag,sizeof(zval*),NULL);
+					} else if (parser->level == (XML_MAXLEVEL + 1)) {
+						TSRMLS_FETCH();
+						php_error_docref(NULL TSRMLS_CC, E_WARNING, "Maximum depth exceeded - Results truncated");
+					}
 				}
 			} else {
 				efree(decoded_value);
diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c
index 314be4529..f4c264321 100644
--- a/ext/xmlreader/php_xmlreader.c
+++ b/ext/xmlreader/php_xmlreader.c
@@ -708,7 +708,7 @@ PHP_METHOD(xmlreader, moveToAttribute)
 /* }}} */
 
 /* {{{ proto boolean XMLReader::moveToAttributeNo(int index)
-Positions reader at attribute at spcecified index.
+Positions reader at attribute at specified index.
 Returns TRUE on success and FALSE on failure */
 PHP_METHOD(xmlreader, moveToAttributeNo)
 {
@@ -805,7 +805,7 @@ PHP_METHOD(xmlreader, read)
 	if (intern != NULL && intern->ptr != NULL) {
 		retval = xmlTextReaderRead(intern->ptr);
 		if (retval == -1) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occured while reading");
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occurred while reading");
 			RETURN_FALSE;
 		} else {
 			RETURN_BOOL(retval);
@@ -847,7 +847,7 @@ PHP_METHOD(xmlreader, next)
 			retval = xmlTextReaderNext(intern->ptr); 
 		}
 		if (retval == -1) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occured while reading");
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occurred while reading");
 			RETURN_FALSE;
 		} else {
 			RETURN_BOOL(retval);
@@ -1155,7 +1155,7 @@ PHP_METHOD(xmlreader, expand)
 		node = xmlTextReaderExpand(intern->ptr);
 		
 		if (node == NULL) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occured while expanding ");
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occurred while expanding ");
 			RETURN_FALSE;
 		} else {
 			nodec = xmlDocCopyNode(node, docp, 1);
diff --git a/ext/xmlreader/tests/003.phpt b/ext/xmlreader/tests/003.phpt
index 48aa4be0b..85353a824 100644
--- a/ext/xmlreader/tests/003.phpt
+++ b/ext/xmlreader/tests/003.phpt
@@ -5,7 +5,7 @@ XMLReader: libxml2 XML Reader, attributes test
 --FILE--
 <?php 
 /* $Id$ */
-$filename = dirname(__FILE__) . '/_002.xml';
+$filename = dirname(__FILE__) . '/_003.xml';
 
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
 <books><book num="1" idx="2">book1</book></books>';
diff --git a/ext/xmlreader/tests/004.phpt b/ext/xmlreader/tests/004.phpt
index d4f044e97..b2d7254fe 100644
--- a/ext/xmlreader/tests/004.phpt
+++ b/ext/xmlreader/tests/004.phpt
@@ -5,7 +5,7 @@ XMLReader: libxml2 XML Reader, attributes test
 --FILE--
 <?php 
 /* $Id$ */
-$filename = dirname(__FILE__) . '/_002.xml';
+$filename = dirname(__FILE__) . '/_004.xml';
 
 $xmlstring = '<?xml version="1.0" encoding="UTF-8"?>
 <books><book num="1" idx="2">book1</book></books>';
diff --git a/ext/xmlreader/tests/007.phpt b/ext/xmlreader/tests/007.phpt
index 842f25e5f..aacd059b6 100644
--- a/ext/xmlreader/tests/007.phpt
+++ b/ext/xmlreader/tests/007.phpt
@@ -8,7 +8,7 @@ XMLReader: libxml2 XML Reader, setRelaxNGSchema
 
 $xmlstring = '<TEI.2>hello</TEI.2>';
 $relaxngfile = dirname(__FILE__) . '/relaxNG.rng'; 
-$file = dirname(__FILE__) . '/__007.xml';
+$file = dirname(__FILE__) . '/_007.xml';
 file_put_contents($file, $xmlstring);
 
 $reader = new XMLReader();
diff --git a/ext/xmlreader/tests/008.phpt b/ext/xmlreader/tests/008.phpt
index e3af00e4f..2dbb5e7c8 100644
--- a/ext/xmlreader/tests/008.phpt
+++ b/ext/xmlreader/tests/008.phpt
@@ -23,7 +23,7 @@ $xmlstring = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 </LIST>';
 
 $dtdfile = rawurlencode(dirname(__FILE__)) . '/dtdexample.dtd'; 
-$file = dirname(__FILE__) . '/__008.xml';
+$file = dirname(__FILE__) . '/_008.xml';
 file_put_contents($file, $xmlstring);
 
 
diff --git a/ext/xmlrpc/libxmlrpc/simplestring.c b/ext/xmlrpc/libxmlrpc/simplestring.c
index 7211d2cd9..a084d0e64 100644
--- a/ext/xmlrpc/libxmlrpc/simplestring.c
+++ b/ext/xmlrpc/libxmlrpc/simplestring.c
@@ -66,7 +66,7 @@ static const char rcsid[] = "#(@) $Id$";
  *
  *   simplestring is, as the name implies, a simple API for dealing with C strings.
  *   Why would I write yet another string API?  Because I couldn't find any that were
- *   a) free / GPL, b) simple/lightweight, c) fast, not doing unneccesary strlens all
+ *   a) free / GPL, b) simple/lightweight, c) fast, not doing unnecessary strlens all
  *   over the place.  So.  It is simple, and it seems to work, and it is pretty fast.
  *
  *   Oh, and it is also binary safe, ie it can handle strings with embedded NULLs,
diff --git a/ext/xmlrpc/libxmlrpc/xml_to_soap.c b/ext/xmlrpc/libxmlrpc/xml_to_soap.c
index 664e8b77b..ac103e061 100644
--- a/ext/xmlrpc/libxmlrpc/xml_to_soap.c
+++ b/ext/xmlrpc/libxmlrpc/xml_to_soap.c
@@ -279,7 +279,7 @@ XMLRPC_VALUE xml_element_to_SOAP_REQUEST_worker(XMLRPC_REQUEST request,
 			else if (!strcmp(attr_iter->key, TOKEN_MUSTUNDERSTAND)) {
 				b_must_understand = strchr(attr_iter->val, '1') ? 1 : 0;
 			}
-			/* actor, used in conjuction with must understand. */
+			/* actor, used in conjunction with must understand. */
 			else if (!strcmp(attr_iter->key, TOKEN_ACTOR)) {
 				actor = attr_iter->val;
 			}
diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc.c b/ext/xmlrpc/libxmlrpc/xmlrpc.c
index ec2321b34..ce70c2afd 100644
--- a/ext/xmlrpc/libxmlrpc/xmlrpc.c
+++ b/ext/xmlrpc/libxmlrpc/xmlrpc.c
@@ -897,7 +897,7 @@ const char *XMLRPC_SetValueID_Case(XMLRPC_VALUE value, const char* id, int len,
          (len > 0) ? simplestring_addn(&value->id, id, len) :
                      simplestring_add(&value->id, id);
 
-         /* upper or lower case string in place if required. could be a seperate func. */
+         /* upper or lower case string in place if required. could be a separate func. */
          if(id_case == xmlrpc_case_lower || id_case == xmlrpc_case_upper) {
             int i;
             for(i = 0; i < value->id.len; i++) {
@@ -1609,7 +1609,7 @@ XMLRPC_VALUE XMLRPC_CopyValue(XMLRPC_VALUE value) {
  *   XMLRPC_CopyValue ()
  * NOTES
  *   Use this when function when you need to modify the contents of
- *   the copied value seperately from the original.
+ *   the copied value separately from the original.
  *   
  *   this function is recursive, thus the value and all of its children
  *   (if any) will be duplicated.
diff --git a/ext/xmlrpc/tests/003.phpt b/ext/xmlrpc/tests/003.phpt
new file mode 100644
index 000000000..3d6796dba
--- /dev/null
+++ b/ext/xmlrpc/tests/003.phpt
@@ -0,0 +1,109 @@
+--TEST--
+xmlrpc_encode() Simple test encode array
+--SKIPIF--
+<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+--FILE--
+<?php
+
+$params = array(
+	"one" => "red",
+	"two" => "blue",
+	"three" => "green"
+);
+
+$response = xmlrpc_encode($params);
+echo $response;
+
+$params = array(
+	"red",
+	"blue",
+	"green"
+);
+
+$response = xmlrpc_encode($params);
+echo $response;
+
+$params = array(
+	0 => "red",
+	1 => "blue",
+	3 => "green"
+);
+
+$response = xmlrpc_encode($params);
+echo $response;
+
+--EXPECT--
+<?xml version="1.0" encoding="utf-8"?>
+<params>
+<param>
+ <value>
+  <struct>
+   <member>
+    <name>one</name>
+    <value>
+     <string>red</string>
+    </value>
+   </member>
+   <member>
+    <name>two</name>
+    <value>
+     <string>blue</string>
+    </value>
+   </member>
+   <member>
+    <name>three</name>
+    <value>
+     <string>green</string>
+    </value>
+   </member>
+  </struct>
+ </value>
+</param>
+</params>
+<?xml version="1.0" encoding="utf-8"?>
+<params>
+<param>
+ <value>
+  <array>
+   <data>
+    <value>
+     <string>red</string>
+    </value>
+    <value>
+     <string>blue</string>
+    </value>
+    <value>
+     <string>green</string>
+    </value>
+   </data>
+  </array>
+ </value>
+</param>
+</params>
+<?xml version="1.0" encoding="utf-8"?>
+<params>
+<param>
+ <value>
+  <struct>
+   <member>
+    <name>0</name>
+    <value>
+     <string>red</string>
+    </value>
+   </member>
+   <member>
+    <name>1</name>
+    <value>
+     <string>blue</string>
+    </value>
+   </member>
+   <member>
+    <name>3</name>
+    <value>
+     <string>green</string>
+    </value>
+   </member>
+  </struct>
+ </value>
+</param>
+</params>
\ No newline at end of file
diff --git a/ext/xmlrpc/tests/004.phpt b/ext/xmlrpc/tests/004.phpt
new file mode 100644
index 000000000..04f3ef315
--- /dev/null
+++ b/ext/xmlrpc/tests/004.phpt
@@ -0,0 +1,19 @@
+--TEST--
+xmlrpc_encode() Simple test encode int
+--SKIPIF--
+<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+--FILE--
+<?php
+
+$response = xmlrpc_encode(1);
+echo $response;
+
+--EXPECT--
+<?xml version="1.0" encoding="utf-8"?>
+<params>
+<param>
+ <value>
+  <int>1</int>
+ </value>
+</param>
+</params>
\ No newline at end of file
diff --git a/ext/xmlrpc/tests/005.phpt b/ext/xmlrpc/tests/005.phpt
new file mode 100644
index 000000000..613dfde24
--- /dev/null
+++ b/ext/xmlrpc/tests/005.phpt
@@ -0,0 +1,47 @@
+--TEST--
+xmlrpc_encode() Simple test encode type double and String
+
+--CREDITS--
+Michel Araujo <araujo_michel@yahoo.com.br>
+#PHPSP 2013-08-22
+
+--SKIPIF--
+<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+
+--FILE--
+<?php
+
+$response = xmlrpc_encode(3.24234);
+echo $response;
+
+$response = xmlrpc_encode(-3.24234);
+echo $response;
+
+$response = xmlrpc_encode('Is string');
+echo $response;
+
+--EXPECT--
+<?xml version="1.0" encoding="utf-8"?>
+<params>
+<param>
+ <value>
+  <double>3.24234</double>
+ </value>
+</param>
+</params>
+<?xml version="1.0" encoding="utf-8"?>
+<params>
+<param>
+ <value>
+  <double>-3.24234</double>
+ </value>
+</param>
+</params>
+<?xml version="1.0" encoding="utf-8"?>
+<params>
+<param>
+ <value>
+  <string>Is string</string>
+ </value>
+</param>
+</params>
\ No newline at end of file
diff --git a/ext/xmlrpc/tests/006.phpt b/ext/xmlrpc/tests/006.phpt
new file mode 100644
index 000000000..f33932d5a
--- /dev/null
+++ b/ext/xmlrpc/tests/006.phpt
@@ -0,0 +1,29 @@
+--TEST--
+xmlrpc_decode() Simple test decode type string
+
+--CREDITS--
+Michel Araujo <araujo_michel@yahoo.com.br>
+#PHPSP 2013-08-22
+
+--SKIPIF--
+<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+
+--FILE--
+<?php
+
+$xml = <<<XML
+<?xml version="1.0" encoding="utf-8"?>
+<params>
+<param>
+ <value>
+  <string>Is string</string>
+ </value>
+</param>
+</params>
+XML;
+
+$response = xmlrpc_decode($xml);
+echo $response;
+
+--EXPECT--
+Is string
\ No newline at end of file
diff --git a/ext/xmlrpc/tests/007.phpt b/ext/xmlrpc/tests/007.phpt
new file mode 100644
index 000000000..84c15a7d8
--- /dev/null
+++ b/ext/xmlrpc/tests/007.phpt
@@ -0,0 +1,29 @@
+--TEST--
+xmlrpc_decode() Simple test decode type int
+
+--CREDITS--
+Michel Araujo <araujo_michel@yahoo.com.br>
+#PHPSP 2013-08-22
+
+--SKIPIF--
+<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
+
+--FILE--
+<?php
+
+$xml = <<<XML
+<?xml version="1.0" encoding="utf-8"?>
+<params>
+<param>
+ <value>
+  <int>1</int>
+ </value>
+</param>
+</params>
+XML;
+
+$response = xmlrpc_decode($xml);
+echo $response;
+
+--EXPECT--
+1
\ No newline at end of file
diff --git a/ext/xmlwriter/tests/bug41287.phpt b/ext/xmlwriter/tests/bug41287.phpt
index 0612b21f1..72b6720f1 100644
--- a/ext/xmlwriter/tests/bug41287.phpt
+++ b/ext/xmlwriter/tests/bug41287.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #41287 (Namespace functions don't allow xmlns defintion to be optional)
+Bug #41287 (Namespace functions don't allow xmlns definition to be optional)
 --SKIPIF--
 <?php 
 if (!extension_loaded("xmlwriter")) die("skip"); 
diff --git a/ext/xsl/xsltprocessor.c b/ext/xsl/xsltprocessor.c
index 1785519c1..af11104a2 100644
--- a/ext/xsl/xsltprocessor.c
+++ b/ext/xsl/xsltprocessor.c
@@ -476,7 +476,7 @@ PHP_FUNCTION(xsl_xsltprocessor_import_stylesheet)
 
 static xmlDocPtr php_xsl_apply_stylesheet(zval *id, xsl_object *intern, xsltStylesheetPtr style, zval *docp TSRMLS_DC) /* {{{ */
 {
-	xmlDocPtr newdocp;
+	xmlDocPtr newdocp = NULL;
 	xmlDocPtr doc = NULL;
 	xmlNodePtr node = NULL;
 	xsltTransformContextPtr ctxt;
diff --git a/ext/zip/lib/zip_open.c b/ext/zip/lib/zip_open.c
index 2f56881b0..5ce1c1070 100644
--- a/ext/zip/lib/zip_open.c
+++ b/ext/zip/lib/zip_open.c
@@ -348,7 +348,7 @@ _zip_checkcons(FILE *fp, struct zip_cdir *cd, struct zip_error *error)
 
 
 /* _zip_check_torrentzip:
-   check wether ZA has a valid TORRENTZIP comment, i.e. is torrentzipped */
+   check whether ZA has a valid TORRENTZIP comment, i.e. is torrentzipped */
 
 static void
 _zip_check_torrentzip(struct zip *za)
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index 0c033d4e4..d7bd5f49e 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -1654,7 +1654,7 @@ static void php_zip_add_from_pattern(INTERNAL_FUNCTION_PARAMETERS, int type) /*
 	char *path = NULL;
 	char *remove_path = NULL;
 	char *add_path = NULL;
-	int pattern_len, add_path_len, remove_path_len, path_len = 0;
+	int pattern_len, add_path_len = 0, remove_path_len = 0, path_len = 0;
 	long remove_all_path = 0;
 	long flags = 0;
 	zval *options = NULL;
diff --git a/ext/zip/tests/bug64342_0.phpt b/ext/zip/tests/bug64342_0.phpt
index 066d3e6fc..ea7afa8e0 100644
--- a/ext/zip/tests/bug64342_0.phpt
+++ b/ext/zip/tests/bug64342_0.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #64342 ZipArchive::addFile() has to check file existance (variation 1)
+Bug #64342 ZipArchive::addFile() has to check file existence (variation 1)
 --SKIPIF--
 <?php
 	if(!extension_loaded('zip')) die('skip');
diff --git a/ext/zip/tests/bug64342_1.phpt b/ext/zip/tests/bug64342_1.phpt
index 2b1357d12..06b0b92ca 100644
--- a/ext/zip/tests/bug64342_1.phpt
+++ b/ext/zip/tests/bug64342_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #64342 ZipArchive::addFile() has to check file existance (variation 2)
+Bug #64342 ZipArchive::addFile() has to check file existence (variation 2)
 --SKIPIF--
 <?php
 /* $Id$ */
diff --git a/ext/zlib/tests/bug61139.phpt b/ext/zlib/tests/bug61139.phpt
index eaca00369..71961a64d 100644
--- a/ext/zlib/tests/bug61139.phpt
+++ b/ext/zlib/tests/bug61139.phpt
@@ -10,5 +10,9 @@ if (!extension_loaded('zlib')) {
 <?php
 
 gzopen('someFile', 'c');
+--CLEAN--
+<?php 
+	unlink('someFile'); 
+?>
 --EXPECTF--
 Warning: gzopen(): gzopen failed in %s on line %d
diff --git a/ext/zlib/tests/bug65391.phpt b/ext/zlib/tests/bug65391.phpt
new file mode 100644
index 000000000..3ba535081
--- /dev/null
+++ b/ext/zlib/tests/bug65391.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Bug #65391 (Unable to send vary header user-agent when ob_start('ob_gzhandler') is called)
+--SKIPIF--
+<?php
+extension_loaded("zlib") or die("skip need zlib");
+?>
+--GET--
+dummy=1
+--FILE--
+<?php
+header("Vary: Cookie");
+ob_start("ob_gzhandler");
+
+// run-tests cannot test for a multiple Vary header
+ob_flush();
+print_r(headers_list());
+
+?>
+Done
+--EXPECTF--
+Array
+(
+    [0] => X-Powered-By: PHP/%s
+    [1] => Vary: Cookie
+    [2] => Vary: Accept-Encoding
+)
+Done
+
diff --git a/ext/zlib/tests/gzfile_variation1.phpt b/ext/zlib/tests/gzfile_variation1.phpt
index 767abb7e3..131170b4b 100644
--- a/ext/zlib/tests/gzfile_variation1.phpt
+++ b/ext/zlib/tests/gzfile_variation1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function gzfile() by substituting agument 1 with array values.
+Test function gzfile() by substituting argument 1 with array values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/gzfile_variation10.phpt b/ext/zlib/tests/gzfile_variation10.phpt
index 2a6d8915d..20de8cb53 100644
--- a/ext/zlib/tests/gzfile_variation10.phpt
+++ b/ext/zlib/tests/gzfile_variation10.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function gzfile() by substituting agument 2 with emptyUnsetUndefNull values.
+Test function gzfile() by substituting argument 2 with emptyUnsetUndefNull values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/gzfile_variation11.phpt b/ext/zlib/tests/gzfile_variation11.phpt
index 02faa4501..a3585e542 100644
--- a/ext/zlib/tests/gzfile_variation11.phpt
+++ b/ext/zlib/tests/gzfile_variation11.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function gzfile() by substituting agument 2 with float values.
+Test function gzfile() by substituting argument 2 with float values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/gzfile_variation12.phpt b/ext/zlib/tests/gzfile_variation12.phpt
index a8efc7616..be28f0168 100644
--- a/ext/zlib/tests/gzfile_variation12.phpt
+++ b/ext/zlib/tests/gzfile_variation12.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function gzfile() by substituting agument 2 with int values.
+Test function gzfile() by substituting argument 2 with int values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/gzfile_variation13.phpt b/ext/zlib/tests/gzfile_variation13.phpt
index 8014d7d9d..4198c474d 100644
--- a/ext/zlib/tests/gzfile_variation13.phpt
+++ b/ext/zlib/tests/gzfile_variation13.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function gzfile() by substituting agument 2 with object values.
+Test function gzfile() by substituting argument 2 with object values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/gzfile_variation14.phpt b/ext/zlib/tests/gzfile_variation14.phpt
index 8eb183c1c..7462bea80 100644
--- a/ext/zlib/tests/gzfile_variation14.phpt
+++ b/ext/zlib/tests/gzfile_variation14.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function gzfile() by substituting agument 2 with string values.
+Test function gzfile() by substituting argument 2 with string values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/gzfile_variation2.phpt b/ext/zlib/tests/gzfile_variation2.phpt
index 2f75c7f81..ba487435c 100644
--- a/ext/zlib/tests/gzfile_variation2.phpt
+++ b/ext/zlib/tests/gzfile_variation2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function gzfile() by substituting agument 1 with boolean values.
+Test function gzfile() by substituting argument 1 with boolean values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/gzfile_variation3.phpt b/ext/zlib/tests/gzfile_variation3.phpt
index 8a6f2cec2..cf4520d41 100644
--- a/ext/zlib/tests/gzfile_variation3.phpt
+++ b/ext/zlib/tests/gzfile_variation3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function gzfile() by substituting agument 1 with emptyUnsetUndefNull values.
+Test function gzfile() by substituting argument 1 with emptyUnsetUndefNull values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/gzfile_variation4.phpt b/ext/zlib/tests/gzfile_variation4.phpt
index b3c8ac483..331023156 100644
--- a/ext/zlib/tests/gzfile_variation4.phpt
+++ b/ext/zlib/tests/gzfile_variation4.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function gzfile() by substituting agument 1 with float values.
+Test function gzfile() by substituting argument 1 with float values.
 --SKIPIF--
 <?php
 if (!extension_loaded(zlib)) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/gzfile_variation5.phpt b/ext/zlib/tests/gzfile_variation5.phpt
index 5e210b653..6a874a578 100644
--- a/ext/zlib/tests/gzfile_variation5.phpt
+++ b/ext/zlib/tests/gzfile_variation5.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function gzfile() by substituting agument 1 with int values.
+Test function gzfile() by substituting argument 1 with int values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/gzfile_variation6.phpt b/ext/zlib/tests/gzfile_variation6.phpt
index 1ce1be659..64168180f 100644
--- a/ext/zlib/tests/gzfile_variation6.phpt
+++ b/ext/zlib/tests/gzfile_variation6.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function gzfile() by substituting agument 1 with object values.
+Test function gzfile() by substituting argument 1 with object values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/gzfile_variation7.phpt b/ext/zlib/tests/gzfile_variation7.phpt
index b441dd670..c9dd29826 100644
--- a/ext/zlib/tests/gzfile_variation7.phpt
+++ b/ext/zlib/tests/gzfile_variation7.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function gzfile() by substituting agument 1 with string values.
+Test function gzfile() by substituting argument 1 with string values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/gzfile_variation8.phpt b/ext/zlib/tests/gzfile_variation8.phpt
index 32d969326..50d042218 100644
--- a/ext/zlib/tests/gzfile_variation8.phpt
+++ b/ext/zlib/tests/gzfile_variation8.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function gzfile() by substituting agument 2 with array values.
+Test function gzfile() by substituting argument 2 with array values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/gzfile_variation9.phpt b/ext/zlib/tests/gzfile_variation9.phpt
index c2c24ae26..3675dcbef 100644
--- a/ext/zlib/tests/gzfile_variation9.phpt
+++ b/ext/zlib/tests/gzfile_variation9.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function gzfile() by substituting agument 2 with boolean values.
+Test function gzfile() by substituting argument 2 with boolean values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation1.phpt b/ext/zlib/tests/readgzfile_variation1.phpt
index e31824ce1..5a5ec4f6e 100644
--- a/ext/zlib/tests/readgzfile_variation1.phpt
+++ b/ext/zlib/tests/readgzfile_variation1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 1 with array values.
+Test function readgzfile() by substituting argument 1 with array values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation10.phpt b/ext/zlib/tests/readgzfile_variation10.phpt
index 29249a1f2..bc6cc5b45 100644
--- a/ext/zlib/tests/readgzfile_variation10.phpt
+++ b/ext/zlib/tests/readgzfile_variation10.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 2 with emptyUnsetUndefNull values.
+Test function readgzfile() by substituting argument 2 with emptyUnsetUndefNull values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation11.phpt b/ext/zlib/tests/readgzfile_variation11.phpt
index 4023211ff..01dc78721 100644
--- a/ext/zlib/tests/readgzfile_variation11.phpt
+++ b/ext/zlib/tests/readgzfile_variation11.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 2 with float values.
+Test function readgzfile() by substituting argument 2 with float values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation12.phpt b/ext/zlib/tests/readgzfile_variation12.phpt
index 8c291a4f4..06486acdd 100644
--- a/ext/zlib/tests/readgzfile_variation12.phpt
+++ b/ext/zlib/tests/readgzfile_variation12.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 2 with int values.
+Test function readgzfile() by substituting argument 2 with int values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation13.phpt b/ext/zlib/tests/readgzfile_variation13.phpt
index 117860eb4..db1bd892a 100644
--- a/ext/zlib/tests/readgzfile_variation13.phpt
+++ b/ext/zlib/tests/readgzfile_variation13.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 2 with object values.
+Test function readgzfile() by substituting argument 2 with object values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation14.phpt b/ext/zlib/tests/readgzfile_variation14.phpt
index ee0d6d6d4..90081a946 100644
--- a/ext/zlib/tests/readgzfile_variation14.phpt
+++ b/ext/zlib/tests/readgzfile_variation14.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 2 with string values.
+Test function readgzfile() by substituting argument 2 with string values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation2.phpt b/ext/zlib/tests/readgzfile_variation2.phpt
index 367cc401b..53a9f3e31 100644
--- a/ext/zlib/tests/readgzfile_variation2.phpt
+++ b/ext/zlib/tests/readgzfile_variation2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 1 with boolean values.
+Test function readgzfile() by substituting argument 1 with boolean values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation3.phpt b/ext/zlib/tests/readgzfile_variation3.phpt
index 6645d67b7..8afb16946 100644
--- a/ext/zlib/tests/readgzfile_variation3.phpt
+++ b/ext/zlib/tests/readgzfile_variation3.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 1 with emptyUnsetUndefNull values.
+Test function readgzfile() by substituting argument 1 with emptyUnsetUndefNull values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation4.phpt b/ext/zlib/tests/readgzfile_variation4.phpt
index ece84a990..00211f7df 100644
--- a/ext/zlib/tests/readgzfile_variation4.phpt
+++ b/ext/zlib/tests/readgzfile_variation4.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 1 with float values.
+Test function readgzfile() by substituting argument 1 with float values.
 --SKIPIF--
 <?php
 if (!extension_loaded(zlib)) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation5.phpt b/ext/zlib/tests/readgzfile_variation5.phpt
index 460e18893..2aa83fde3 100644
--- a/ext/zlib/tests/readgzfile_variation5.phpt
+++ b/ext/zlib/tests/readgzfile_variation5.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 1 with int values.
+Test function readgzfile() by substituting argument 1 with int values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation6.phpt b/ext/zlib/tests/readgzfile_variation6.phpt
index 69a4dc190..702f91850 100644
--- a/ext/zlib/tests/readgzfile_variation6.phpt
+++ b/ext/zlib/tests/readgzfile_variation6.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 1 with object values.
+Test function readgzfile() by substituting argument 1 with object values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation7.phpt b/ext/zlib/tests/readgzfile_variation7.phpt
index 20162b5cb..f4abdac9b 100644
--- a/ext/zlib/tests/readgzfile_variation7.phpt
+++ b/ext/zlib/tests/readgzfile_variation7.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 1 with string values.
+Test function readgzfile() by substituting argument 1 with string values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation8.phpt b/ext/zlib/tests/readgzfile_variation8.phpt
index 2e155288f..291b69efc 100644
--- a/ext/zlib/tests/readgzfile_variation8.phpt
+++ b/ext/zlib/tests/readgzfile_variation8.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 2 with array values.
+Test function readgzfile() by substituting argument 2 with array values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/tests/readgzfile_variation9.phpt b/ext/zlib/tests/readgzfile_variation9.phpt
index 5cdb5b5da..d90058f8d 100644
--- a/ext/zlib/tests/readgzfile_variation9.phpt
+++ b/ext/zlib/tests/readgzfile_variation9.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test function readgzfile() by substituting agument 2 with boolean values.
+Test function readgzfile() by substituting argument 2 with boolean values.
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) die ('skip zlib extension not available in this build');
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 1a202e344..1114bc8a6 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -190,7 +190,7 @@ static int php_zlib_output_handler(void **handler_context, php_output_context *o
 		if ((output_context->op & PHP_OUTPUT_HANDLER_START)
 		&&	(output_context->op != (PHP_OUTPUT_HANDLER_START|PHP_OUTPUT_HANDLER_CLEAN|PHP_OUTPUT_HANDLER_FINAL))
 		) {
-			sapi_add_header_ex(ZEND_STRL("Vary: Accept-Encoding"), 1, 1 TSRMLS_CC);
+			sapi_add_header_ex(ZEND_STRL("Vary: Accept-Encoding"), 1, 0 TSRMLS_CC);
 		}
 		return FAILURE;
 	}
@@ -220,7 +220,7 @@ static int php_zlib_output_handler(void **handler_context, php_output_context *o
 						deflateEnd(&ctx->Z);
 						return FAILURE;
 				}
-				sapi_add_header_ex(ZEND_STRL("Vary: Accept-Encoding"), 1, 1 TSRMLS_CC);
+				sapi_add_header_ex(ZEND_STRL("Vary: Accept-Encoding"), 1, 0 TSRMLS_CC);
 				php_output_handler_hook(PHP_OUTPUT_HANDLER_HOOK_IMMUTABLE, NULL TSRMLS_CC);
 			}
 		}
@@ -478,7 +478,7 @@ static PHP_FUNCTION(ob_gzhandler)
 				sapi_add_header_ex(ZEND_STRL("Content-Encoding: deflate"), 1, 1 TSRMLS_CC);
 				break;
 		}
-		sapi_add_header_ex(ZEND_STRL("Vary: Accept-Encoding"), 1, 1 TSRMLS_CC);
+		sapi_add_header_ex(ZEND_STRL("Vary: Accept-Encoding"), 1, 0 TSRMLS_CC);
 	}
 
 	if (!ZLIBG(ob_gzhandler)) {
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 6f11cf3f3..9b8645a06 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -775,7 +775,12 @@ PHPAPI char *expand_filepath_with_mode(const char *filepath, char *real_path, co
 				 * we cannot cannot getcwd() and the requested,
 				 * relatively referenced file is accessible */
 				copy_len = strlen(filepath) > MAXPATHLEN - 1 ? MAXPATHLEN - 1 : strlen(filepath);
-				real_path = estrndup(filepath, copy_len);
+				if (real_path) {
+					memcpy(real_path, filepath, copy_len);
+					real_path[copy_len] = '\0';
+				} else {
+					real_path = estrndup(filepath, copy_len);
+				}
 				close(fdtest);
 				return real_path;
 			} else {
diff --git a/main/main.c b/main/main.c
index 7a253f8b2..1fd82c839 100644
--- a/main/main.c
+++ b/main/main.c
@@ -115,6 +115,10 @@
 #endif
 /* }}} */
 
+#ifndef S_ISREG
+#define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG)
+#endif
+
 PHPAPI int (*php_register_internal_extensions_func)(TSRMLS_D) = php_register_internal_extensions;
 
 #ifndef ZTS
@@ -276,13 +280,14 @@ static void php_binary_init(TSRMLS_D)
 			if ((envpath = getenv("PATH")) != NULL) {
 				char *search_dir, search_path[MAXPATHLEN];
 				char *last = NULL;
+				struct stat s;
 
 				path = estrdup(envpath);
 				search_dir = php_strtok_r(path, ":", &last);
 
 				while (search_dir) {
 					snprintf(search_path, MAXPATHLEN, "%s/%s", search_dir, sapi_module.executable_location);
-					if (VCWD_REALPATH(search_path, binary_location) && !VCWD_ACCESS(binary_location, X_OK)) {
+					if (VCWD_REALPATH(search_path, binary_location) && !VCWD_ACCESS(binary_location, X_OK) && VCWD_STAT(binary_location, &s) == 0 && S_ISREG(s.st_mode)) {
 						found = 1;
 						break;
 					}
@@ -784,6 +789,9 @@ PHPAPI void php_verror(const char *docref, const char *params, int type, const c
 	/* no docref given but function is known (the default) */
 	if (!docref && is_function) {
 		int doclen;
+		while (*function == '_') {
+			function++;
+		}
 		if (space[0] == '\0') {
 			doclen = spprintf(&docref_buf, 0, "function.%s", function);
 		} else {
@@ -1523,7 +1531,7 @@ int php_request_startup(TSRMLS_D)
 	int retval = SUCCESS;
 
 #ifdef HAVE_DTRACE
-	DTRACE_REQUEST_STARTUP(SAFE_FILENAME(SG(request_info).path_translated), SAFE_FILENAME(SG(request_info).request_uri), SAFE_FILENAME(SG(request_info).request_method));
+	DTRACE_REQUEST_STARTUP(SAFE_FILENAME(SG(request_info).path_translated), SAFE_FILENAME(SG(request_info).request_uri), (char *)SAFE_FILENAME(SG(request_info).request_method));
 #endif /* HAVE_DTRACE */
 
 #ifdef PHP_WIN32
@@ -1833,7 +1841,7 @@ void php_request_shutdown(void *dummy)
 #endif
 
 #ifdef HAVE_DTRACE
-	DTRACE_REQUEST_SHUTDOWN(SAFE_FILENAME(SG(request_info).path_translated), SAFE_FILENAME(SG(request_info).request_uri), SAFE_FILENAME(SG(request_info).request_method));
+	DTRACE_REQUEST_SHUTDOWN(SAFE_FILENAME(SG(request_info).path_translated), SAFE_FILENAME(SG(request_info).request_uri), (char *)SAFE_FILENAME(SG(request_info).request_method));
 #endif /* HAVE_DTRACE */
 }
 /* }}} */
@@ -2070,6 +2078,8 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
 	EG(exception_class) = NULL;
 	PG(disable_functions) = NULL;
 	PG(disable_classes) = NULL;
+	EG(exception) = NULL;
+	EG(objects_store).object_buckets = NULL;
 
 #if HAVE_SETLOCALE
 	setlocale(LC_CTYPE, "");
diff --git a/main/php_config.h.in b/main/php_config.h.in
index bbe6d43b5..f0eecc15f 100644
--- a/main/php_config.h.in
+++ b/main/php_config.h.in
@@ -25,9 +25,6 @@
 #undef BETHREADS
 
 /* */
-#undef BUGGY_SNMPRINT_VALUE
-
-/* */
 #undef CDB_INCLUDE_FILE
 
 /* Define if system uses EBCDIC */
@@ -1762,16 +1759,16 @@
 /* whether you have struct flock */
 #undef HAVE_STRUCT_FLOCK
 
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* Define to 1 if `st_blksize' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
-/* Define to 1 if `st_blocks' is member of `struct stat'. */
+/* Define to 1 if `st_blocks' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLOCKS
 
-/* Define to 1 if `st_rdev' is member of `struct stat'. */
+/* Define to 1 if `st_rdev' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_RDEV
 
-/* Define to 1 if `tm_zone' is member of `struct tm'. */
+/* Define to 1 if `tm_zone' is a member of `struct tm'. */
 #undef HAVE_STRUCT_TM_TM_ZONE
 
 /* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use
@@ -1807,6 +1804,12 @@
 /* Define to 1 if you have the <syslog.h> header file. */
 #undef HAVE_SYSLOG_H
 
+/* FPM use systemd integration */
+#undef HAVE_SYSTEMD
+
+/* Define to 1 if you have the <systemd/sd-daemon.h> header file. */
+#undef HAVE_SYSTEMD_SD_DAEMON_H
+
 /* */
 #undef HAVE_SYSVMSG
 
@@ -1982,7 +1985,7 @@
 /* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */
 #undef HAVE_UTIME_NULL
 
-/* Wether struct utsname has domainname */
+/* Whether struct utsname has domainname */
 #undef HAVE_UTSNAME_DOMAINNAME
 
 /* Define to 1 if you have the `vasprintf' function. */
@@ -2120,6 +2123,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -2156,6 +2162,9 @@
 /* fpm group name */
 #undef PHP_FPM_GROUP
 
+/* fpm systemd service type */
+#undef PHP_FPM_SYSTEMD
+
 /* fpm user name */
 #undef PHP_FPM_USER
 
@@ -2332,6 +2341,28 @@
 /* Define if cross-process locking is required by accept() */
 #undef USE_LOCKING
 
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
 /* */
 #undef USE_TRANSFER_TABLES
 
@@ -2368,12 +2399,15 @@
 /* */
 #undef ZTS
 
-/* Define to 1 if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
 
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
diff --git a/main/php_ini.c b/main/php_ini.c
index bceb6e59f..444b4ce84 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -785,7 +785,12 @@ PHPAPI void php_ini_activate_per_dir_config(char *path, uint path_len TSRMLS_DC)
 	char path_bak[MAXPATHLEN];
 #endif
 
+#if PHP_WIN32
+	/* MAX_PATH is \0-terminated, path_len == MAXPATHLEN would overrun path_bak */
+	if (path_len >= MAXPATHLEN) {
+#else
 	if (path_len > MAXPATHLEN) {
+#endif
 		return;
 	}
 
diff --git a/main/php_variables.c b/main/php_variables.c
index cf2b623d6..4c614692b 100644
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -56,7 +56,7 @@ PHPAPI void php_register_variable_safe(char *var, char *strval, int str_len, zva
 PHPAPI void php_register_variable_ex(char *var_name, zval *val, zval *track_vars_array TSRMLS_DC)
 {
 	char *p = NULL;
-	char *ip;		/* index pointer */
+	char *ip = NULL;		/* index pointer */
 	char *index;
 	char *var, *var_orig;
 	int var_len, index_len;
diff --git a/main/php_version.h b/main/php_version.h
index 750130426..c0a0c6769 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 4
-#define PHP_RELEASE_VERSION 15
+#define PHP_RELEASE_VERSION 21
 #define PHP_EXTRA_VERSION ""
-#define PHP_VERSION "5.4.15"
-#define PHP_VERSION_ID 50415
+#define PHP_VERSION "5.4.21"
+#define PHP_VERSION_ID 50421
diff --git a/main/rfc1867.c b/main/rfc1867.c
index 35a1a1595..8e4820988 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -62,7 +62,7 @@ static void safe_php_register_variable(char *var, char *strval, int val_len, zva
 #define MAX_SIZE_ANONNAME 33
 
 /* Errors */
-#define UPLOAD_ERROR_OK   0  /* File upload succesful */
+#define UPLOAD_ERROR_OK   0  /* File upload successful */
 #define UPLOAD_ERROR_A    1  /* Uploaded file exceeded upload_max_filesize */
 #define UPLOAD_ERROR_B    2  /* Uploaded file exceeded MAX_FILE_SIZE */
 #define UPLOAD_ERROR_C    3  /* Partially uploaded */
@@ -398,7 +398,7 @@ static int find_boundary(multipart_buffer *self, char *boundary TSRMLS_DC)
 static int multipart_buffer_headers(multipart_buffer *self, zend_llist *header TSRMLS_DC)
 {
 	char *line;
-	mime_header_entry prev_entry, entry;
+	mime_header_entry prev_entry = {0}, entry;
 	int prev_len, cur_len;
 
 	/* didn't find boundary, abort */
diff --git a/main/snprintf.h b/main/snprintf.h
index de03542ca..f4ed4d234 100644
--- a/main/snprintf.h
+++ b/main/snprintf.h
@@ -27,7 +27,7 @@ sprintf  offers the ability to make a lot of failures since it does not know
          the size of the buffer it uses. Therefore usage of sprintf often
          results in possible entries for buffer overrun attacks. So please
          use this version only if you are sure the call is safe. sprintf
-         allways terminstes the buffer it writes to.
+         always terminstes the buffer it writes to.
 
 snprintf knows the buffers size and will not write behind it. But you will
          have to use either a static buffer or allocate a dynamic buffer
@@ -48,7 +48,7 @@ spprintf is the dynamical version of snprintf. It allocates the buffer in size
          snprintf and offers possible memory leakes if you miss freeing the
          buffer allocated by the function. Therfore this function should be
          used where either no maximum is known or the maximum is much bigger
-         than normal size required. spprintf allways terminates the buffer.
+         than normal size required. spprintf always terminates the buffer.
 
 Example:
 
@@ -60,7 +60,7 @@ Example:
  sprintf(buffer, "test");      | snprintf(buffer, MAX, "test"); | spprintf(&buffer, MAX, "text");
                                |                                | if (!buffer)
                                |                                |   return OUT_OF_MEMORY
- // sprintf allways terminates | // manual termination of       | // spprintf allays terminates buffer
+ // sprintf always terminates | // manual termination of       | // spprintf allays terminates buffer
  // buffer                     | // buffer *IS* required        |
                                | buffer[MAX-1] = 0;             |
  action_with_buffer(buffer);   | action_with_buffer(buffer);    | action_with_buffer(buffer);
diff --git a/main/spprintf.h b/main/spprintf.h
index 397928a79..d9aa9533e 100644
--- a/main/spprintf.h
+++ b/main/spprintf.h
@@ -22,7 +22,7 @@
 
 The pbuf parameter of all spprintf version receives a pointer to the allocated
 buffer. This buffer must be freed manually after usage using efree() function.
-The buffer will allways be terminated by a zero character. When pbuf is NULL
+The buffer will always be terminated by a zero character. When pbuf is NULL
 the function can be used to calculate the required size of the buffer but for
 that purpose snprintf is faster. When both pbuf and the return value are 0
 than you are out of memory.
diff --git a/main/streams/cast.c b/main/streams/cast.c
index 878b4b52e..bf96d3cf8 100644
--- a/main/streams/cast.c
+++ b/main/streams/cast.c
@@ -31,10 +31,18 @@
 
 /* Under BSD, emulate fopencookie using funopen */
 #if defined(HAVE_FUNOPEN) && !defined(HAVE_FOPENCOOKIE)
+
+/* NetBSD 6.0+ uses off_t instead of fpos_t in funopen */
+# if defined(__NetBSD__) && (__NetBSD_Version__ >= 600000000)
+#  define PHP_FPOS_T off_t
+# else
+#  define PHP_FPOS_T fpos_t
+# endif
+
 typedef struct {
 	int (*reader)(void *, char *, int);
 	int (*writer)(void *, const char *, int);
-	fpos_t (*seeker)(void *, fpos_t, int);
+	PHP_FPOS_T (*seeker)(void *, PHP_FPOS_T, int);
 	int (*closer)(void *);
 } COOKIE_IO_FUNCTIONS_T;
 
@@ -68,11 +76,11 @@ static int stream_cookie_writer(void *cookie, const char *buffer, int size)
 	return php_stream_write((php_stream *)cookie, (char *)buffer, size);
 }
 
-static fpos_t stream_cookie_seeker(void *cookie, off_t position, int whence)
+static PHP_FPOS_T stream_cookie_seeker(void *cookie, off_t position, int whence)
 {
 	TSRMLS_FETCH();
 
-	return (fpos_t)php_stream_seek((php_stream *)cookie, position, whence);
+	return (PHP_FPOS_T)php_stream_seek((php_stream *)cookie, position, whence);
 }
 
 static int stream_cookie_closer(void *cookie)
diff --git a/main/streams/streams.c b/main/streams/streams.c
index cb80e9a16..a835c25d9 100644
--- a/main/streams/streams.c
+++ b/main/streams/streams.c
@@ -2358,6 +2358,7 @@ PHPAPI int _php_stream_scandir(char *dirname, char **namelist[], int flags, php_
 			} else {
 				if(vector_size*2 < vector_size) {
 					/* overflow */
+					php_stream_closedir(stream);
 					efree(vector);
 					return FAILURE;
 				}
@@ -2371,6 +2372,7 @@ PHPAPI int _php_stream_scandir(char *dirname, char **namelist[], int flags, php_
 		nfiles++;
 		if(vector_size < 10 || nfiles == 0) {
 			/* overflow */
+			php_stream_closedir(stream);
 			efree(vector);
 			return FAILURE;
 		}
@@ -2379,7 +2381,7 @@ PHPAPI int _php_stream_scandir(char *dirname, char **namelist[], int flags, php_
 
 	*namelist = vector;
 
-	if (compare) {
+	if (nfiles > 0 && compare) {
 		qsort(*namelist, nfiles, sizeof(char *), (int(*)(const void *, const void *))compare);
 	}
 	return nfiles;
diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c
index beffc73e1..a9c050f26 100644
--- a/main/streams/xp_socket.c
+++ b/main/streams/xp_socket.c
@@ -194,7 +194,7 @@ static int php_sockop_close(php_stream *stream, int close_handle TSRMLS_DC)
 			 * Essentially, we are waiting for the socket to become writeable, which means
 			 * that all pending data has been sent.
 			 * We use a small timeout which should encourage the OS to send the data,
-			 * but at the same time avoid hanging indefintely.
+			 * but at the same time avoid hanging indefinitely.
 			 * */
 			do {
 				n = php_pollfd_for_ms(sock->socket, POLLOUT, 500);
diff --git a/netware/start.c b/netware/start.c
index 2765ffba1..8651a6ccc 100644
--- a/netware/start.c
+++ b/netware/start.c
@@ -24,7 +24,7 @@
 void		*gLibHandle = (void *) NULL;
 rtag_t		gAllocTag = (rtag_t) NULL;
 NXMutex_t	*gLibLock = (NXMutex_t *) NULL;
-int			gLibId = 0;
+int		gLibId = 0;
 
 
 int DisposeLibraryData(	void	*data)
@@ -35,17 +35,17 @@ int DisposeLibraryData(	void	*data)
 
 int _NonAppStart
 (
-	void			*NLMHandle,
-	void			*errorScreen,
+	void		*NLMHandle,
+	void		*errorScreen,
 	const char	*cmdLine,
 	const char	*loadDirPath,
 	size_t		uninitializedDataLength,
-	void			*NLMFileHandle,
-	int			(*readRoutineP)( int conn, void *fileHandle, size_t offset,
-								size_t nbytes, size_t *bytesRead, void *buffer ),
+	void		*NLMFileHandle,
+	int		(*readRoutineP)( int conn, void *fileHandle, size_t offset,
+			size_t nbytes, size_t *bytesRead, void *buffer ),
 	size_t		customDataOffset,
 	size_t		customDataSize,
-	int			messageCount,
+	int		messageCount,
 	const char	**messages
 )
 {
diff --git a/php.ini-development b/php.ini-development
index 4ff4192f6..b935f22eb 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -83,6 +83,8 @@
 ; development version only in development environments as errors shown to
 ; application users can inadvertently leak otherwise secure information.
 
+; This is php.ini-development INI file.
+
 ;;;;;;;;;;;;;;;;;;;
 ; Quick Reference ;
 ;;;;;;;;;;;;;;;;;;;
@@ -197,13 +199,12 @@
 engine = On
 
 ; This directive determines whether or not PHP will recognize code between
-; <? and ?> tags as PHP source which should be processed as such. It's been
-; recommended for several years that you not use the short tag "short cut" and
-; instead to use the full <?php and ?> tag combination. With the wide spread use
-; of XML and use of these tags by other languages, the server can become easily
-; confused and end up parsing the wrong code in the wrong context. But because
-; this short cut has been a feature for such a long time, it's currently still
-; supported for backwards compatibility, but we recommend you don't use them.
+; <? and ?> tags as PHP source which should be processed as such. It is
+; generally recommended that <?php and ?> should be used and that this feature
+; should be disabled, as enabling it may result in issues when generating XML
+; documents, however this remains supported for backward compatibility reasons.
+; Note that this directive does not control the <?= shorthand tag, which can be
+; used regardless of this directive.
 ; Default Value: On
 ; Development Value: Off
 ; Production Value: Off
@@ -903,7 +904,6 @@ default_socket_timeout = 60
 ;extension=php_tidy.dll
 ;extension=php_xmlrpc.dll
 ;extension=php_xsl.dll
-;extension=php_zip.dll
 
 ;;;;;;;;;;;;;;;;;;;
 ; Module Settings ;
@@ -1474,7 +1474,7 @@ session.gc_maxlifetime = 1440
 ;       collection through a shell script, cron entry, or some other method.
 ;       For example, the following script would is the equivalent of
 ;       setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
-;          find /path/to/sessions -cmin +24 | xargs rm
+;          find /path/to/sessions -cmin +24 -type f | xargs rm
 
 ; PHP 4.2 and less have an undocumented feature/bug that allows you to
 ; to initialize a session variable in the global scope.
@@ -1856,6 +1856,11 @@ ldap.max_links = -1
 [dba]
 ;dba.default_handler=
 
+[curl]
+; A default value for the CURLOPT_CAINFO option. This is required to be an
+; absolute path.
+;curl.cainfo =
+
 ; Local Variables:
 ; tab-width: 4
 ; End:
diff --git a/php.ini-production b/php.ini-production
index 814455bbb..4ee7ac92c 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -83,6 +83,8 @@
 ; development version only in development environments as errors shown to
 ; application users can inadvertently leak otherwise secure information.
 
+; This is php.ini-production INI file.
+
 ;;;;;;;;;;;;;;;;;;;
 ; Quick Reference ;
 ;;;;;;;;;;;;;;;;;;;
@@ -197,13 +199,12 @@
 engine = On
 
 ; This directive determines whether or not PHP will recognize code between
-; <? and ?> tags as PHP source which should be processed as such. It's been
-; recommended for several years that you not use the short tag "short cut" and
-; instead to use the full <?php and ?> tag combination. With the wide spread use
-; of XML and use of these tags by other languages, the server can become easily
-; confused and end up parsing the wrong code in the wrong context. But because
-; this short cut has been a feature for such a long time, it's currently still
-; supported for backwards compatibility, but we recommend you don't use them.
+; <? and ?> tags as PHP source which should be processed as such. It is
+; generally recommended that <?php and ?> should be used and that this feature
+; should be disabled, as enabling it may result in issues when generating XML
+; documents, however this remains supported for backward compatibility reasons.
+; Note that this directive does not control the <?= shorthand tag, which can be
+; used regardless of this directive.
 ; Default Value: On
 ; Development Value: Off
 ; Production Value: Off
@@ -903,7 +904,6 @@ default_socket_timeout = 60
 ;extension=php_tidy.dll
 ;extension=php_xmlrpc.dll
 ;extension=php_xsl.dll
-;extension=php_zip.dll
 
 ;;;;;;;;;;;;;;;;;;;
 ; Module Settings ;
@@ -1474,7 +1474,7 @@ session.gc_maxlifetime = 1440
 ;       collection through a shell script, cron entry, or some other method.
 ;       For example, the following script would is the equivalent of
 ;       setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
-;          find /path/to/sessions -cmin +24 | xargs rm
+;          find /path/to/sessions -cmin +24 -type f | xargs rm
 
 ; PHP 4.2 and less have an undocumented feature/bug that allows you to
 ; to initialize a session variable in the global scope.
@@ -1856,6 +1856,11 @@ ldap.max_links = -1
 [dba]
 ;dba.default_handler=
 
+[curl]
+; A default value for the CURLOPT_CAINFO option. This is required to be an
+; absolute path.
+;curl.cainfo =
+
 ; Local Variables:
 ; tab-width: 4
 ; End:
diff --git a/run-tests.php b/run-tests.php
index a746c3696..317f6077a 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -455,7 +455,7 @@ $pass_options = '';
 $compression = 0;
 $output_file = $CUR_DIR . '/php_test_results_' . date('Ymd_Hi') . '.txt';
 
-if ($compression) {
+if ($compression && in_array("compress.zlib", stream_get_filters())) {
 	$output_file = 'compress.zlib://' . $output_file . '.gz';
 }
 
@@ -597,6 +597,15 @@ if (isset($argc) && $argc > 1) {
 					putenv("TEST_PHP_EXECUTABLE=$php");
 					$environment['TEST_PHP_EXECUTABLE'] = $php;
 					break;
+				case 'P':
+					if(constant('PHP_BINARY')) {
+						$php = PHP_BINARY;
+					} else {
+						break;
+					}
+					putenv("TEST_PHP_EXECUTABLE=$php");
+					$environment['TEST_PHP_EXECUTABLE'] = $php;
+					break;
 				case 'q':
 					putenv('NO_INTERACTION=1');
 					break;
@@ -679,13 +688,15 @@ Options:
     -d foo=bar  Pass -d option to the php binary (Define INI entry foo
                 with value 'bar').
 
-    -g          Comma seperated list of groups to show during test run
+    -g          Comma separated list of groups to show during test run
                 (possible values: PASS, FAIL, XFAIL, SKIP, BORK, WARN, LEAK, REDIRECT).
 
     -m          Test for memory leaks with Valgrind.
 
     -p <php>    Specify PHP executable to run.
 
+    -P          Use PHP_BINARY as PHP executable to run.
+
     -q          Quiet, no user interaction (same as environment NO_INTERACTION).
 
     -s <file>   Write output to <file>.
@@ -1534,6 +1545,16 @@ TEST $file
 			}
 		}
 	}
+	
+	if (!extension_loaded("zlib")
+	&& (	array_key_exists("GZIP_POST", $section_text) 
+		||	array_key_exists("DEFLATE_POST", $section_text))
+	) {
+		$message = "ext/zlib required";
+		show_result('SKIP', $tested, $tested_file, "reason: $message", $temp_filenames);
+		junit_mark_test_as('SKIP', $shortname, $tested, null, "<![CDATA[\n$message\n]]>");
+		return 'SKIPPED';
+	}
 
 	if (@count($section_text['REDIRECTTEST']) == 1) {
 		$test_files = array();
diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index af83e9bcf..1961289de 100644
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -59,7 +59,7 @@ if test "$PHP_APXS" != "no"; then
   # Test that we're trying to configure with apache 1.x
   PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
   if test "$APACHE_VERSION" -ge 2000000; then
-    AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropiate switch --with-apxs2]) 
+    AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropriate switch --with-apxs2]) 
   fi
 
   for flag in $APXS_CFLAGS; do
diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php5.c
index 11be0ed22..8361f7f41 100644
--- a/sapi/apache/mod_php5.c
+++ b/sapi/apache/mod_php5.c
@@ -130,7 +130,7 @@ static int sapi_apache_read_post(char *buffer, uint count_bytes TSRMLS_DC)
 
 	/*
 	 * This handles the situation where the browser sends a Expect: 100-continue header
-	 * and needs to recieve confirmation from the server on whether or not it can send
+	 * and needs to receive confirmation from the server on whether or not it can send
 	 * the rest of the request. RFC 2616
 	 *
 	 */
diff --git a/sapi/apache2filter/README b/sapi/apache2filter/README
index 3054e208d..bd6eb1706 100644
--- a/sapi/apache2filter/README
+++ b/sapi/apache2filter/README
@@ -54,7 +54,7 @@ HOW TO CONFIGURE
 
 DEBUGGING APACHE AND PHP
     
-    To debug Apache, we recommened:
+    To debug Apache, we recommend:
 
         1. Use the Prefork MPM (Apache 1.3-like process model) by
            configuring Apache with '--with-mpm=prefork'.
diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4
index c49488d18..b6524fd87 100644
--- a/sapi/apache2filter/config.m4
+++ b/sapi/apache2filter/config.m4
@@ -62,7 +62,7 @@ if test "$PHP_APXS2FILTER" != "no"; then
   # Test that we're trying to configure with apache 2.x
   PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
   if test "$APACHE_VERSION" -le 2000000; then
-    AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropiate switch --with-apxs (without the 2)])
+    AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropriate switch --with-apxs (without the 2)])
   elif test "$APACHE_VERSION" -lt 2000040; then
     AC_MSG_ERROR([Please note that Apache version >= 2.0.40 is required])
   fi
diff --git a/sapi/apache2handler/README b/sapi/apache2handler/README
index 5cbd1b95d..4defa336c 100644
--- a/sapi/apache2handler/README
+++ b/sapi/apache2handler/README
@@ -58,7 +58,7 @@ HOW TO CONFIGURE
 
 DEBUGGING APACHE AND PHP
     
-    To debug Apache, we recommened:
+    To debug Apache, we recommend:
 
         1. Use the Prefork MPM (Apache 1.3-like process model) by
            configuring Apache with '--with-mpm=prefork'.
diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
index 702f91f5d..753de10ba 100644
--- a/sapi/apache2handler/config.m4
+++ b/sapi/apache2handler/config.m4
@@ -61,7 +61,7 @@ if test "$PHP_APXS2" != "no"; then
   # Test that we're trying to configure with apache 2.x
   PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
   if test "$APACHE_VERSION" -le 2000000; then
-    AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropiate switch --with-apxs (without the 2)])
+    AC_MSG_ERROR([You have enabled Apache 2 support while your server is Apache 1.3.  Please use the appropriate switch --with-apxs (without the 2)])
   elif test "$APACHE_VERSION" -lt 2000044; then
     AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
   fi
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index bcb244311..b7f95e0c1 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -632,7 +632,7 @@ zend_first_try {
 		}
 
 		/*
-		 * check if comming due to ErrorDocument
+		 * check if coming due to ErrorDocument
 		 * We make a special exception of 413 (Invalid POST request) as the invalidity of the request occurs
 		 * during processing of the request by PHP during POST processing. Therefor we need to re-use the exiting
 		 * PHP instance to handle the request rather then creating a new one.
diff --git a/sapi/apache_hooks/config.m4 b/sapi/apache_hooks/config.m4
index 4213b7c6a..672f29808 100644
--- a/sapi/apache_hooks/config.m4
+++ b/sapi/apache_hooks/config.m4
@@ -60,7 +60,7 @@ if test "$PHP_APACHE_HOOKS" != "no"; then
   # Test that we're trying to configure with apache 1.x
   PHP_AP_EXTRACT_VERSION($APXS_HTTPD)
   if test "$APACHE_VERSION" -ge 2000000; then
-    AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropiate switch --with-apxs2]) 
+    AC_MSG_ERROR([You have enabled Apache 1.3 support while your server is Apache 2.  Please use the appropriate switch --with-apxs2]) 
   fi
 
   for flag in $APXS_CFLAGS; do
diff --git a/sapi/apache_hooks/mod_php5.c b/sapi/apache_hooks/mod_php5.c
index dda6e4989..66adb482e 100644
--- a/sapi/apache_hooks/mod_php5.c
+++ b/sapi/apache_hooks/mod_php5.c
@@ -275,7 +275,7 @@ static int sapi_apache_read_post(char *buffer, uint count_bytes TSRMLS_DC)
 
 	/*
 	 * This handles the situation where the browser sends a Expect: 100-continue header
-	 * and needs to recieve confirmation from the server on whether or not it can send
+	 * and needs to receive confirmation from the server on whether or not it can send
 	 * the rest of the request. RFC 2616
 	 *
 	 */
diff --git a/sapi/cgi/Makefile.frag b/sapi/cgi/Makefile.frag
index 505119e57..d3d7cb355 100644
--- a/sapi/cgi/Makefile.frag
+++ b/sapi/cgi/Makefile.frag
@@ -5,5 +5,9 @@ $(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_CGI_OBJS)
 
 install-cgi: $(SAPI_CGI_PATH)
 	@echo "Installing PHP CGI binary:        $(INSTALL_ROOT)$(bindir)/"
+	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
 	@$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT)
+	@echo "Installing PHP CGI man page:      $(INSTALL_ROOT)$(mandir)/man1/"
+	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
+	@$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1
 
diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4
index 67251aeb5..49e61c83c 100644
--- a/sapi/cgi/config9.m4
+++ b/sapi/cgi/config9.m4
@@ -71,6 +71,8 @@ if test "$PHP_CGI" != "no"; then
     dnl Expose to Makefile
     PHP_SUBST(SAPI_CGI_PATH)
     PHP_SUBST(BUILD_CGI)
+
+    PHP_OUTPUT(sapi/cgi/php-cgi.1)
 else
   AC_MSG_RESULT(yes)
 fi
diff --git a/sapi/cgi/php-cgi.1.in b/sapi/cgi/php-cgi.1.in
new file mode 100644
index 000000000..340e6c5d6
--- /dev/null
+++ b/sapi/cgi/php-cgi.1.in
@@ -0,0 +1 @@
+.so man1/php.1
diff --git a/sapi/cli/php.1.in b/sapi/cli/php.1.in
index 0e9d07ac7..c113030d1 100644
--- a/sapi/cli/php.1.in
+++ b/sapi/cli/php.1.in
@@ -1,6 +1,8 @@
 .TH PHP 1 "2013" "The PHP Group" "Scripting Language"
 .SH NAME
 php \- PHP Command Line Interface 'CLI'
+.P
+php-cgi \- PHP Common Gateway Interface 'CGI' command
 .SH SYNOPSIS
 .B php
 [options] [
@@ -18,21 +20,21 @@ php \- PHP Command Line Interface 'CLI'
 .LP
 .B php
 [options] [\-B 
-.IR code ] 
+.IR begin_code ]
 .B \-R 
 .IR code
 [\-E 
-.IR code ]
+.IR end_code ]
 [[\-\-]
 .IR args.\|.\|. ]
 .LP
 .B php
 [options] [\-B 
-.IR code ]
+.IR begin_code ]
 .B \-F 
 .IR file
 [\-E 
-.IR code ] 
+.IR end_code ]
 [[\-\-]
 .IR args.\|.\|. ]
 .LP
@@ -84,7 +86,7 @@ and therefore reading from
 .B STDIN 
 explicitly changes the next input line or skips input lines.
 .LP
-PHP also contains an embedded web server for application development purpose. By using the \-S option where
+PHP also contains an built-in web server for application development purpose. By using the \-S option where
 .B addr:port
 point to a local address and port PHP will listen to HTTP requests on that address and port and serve files from the current working directory or the
 .B docroot
@@ -235,9 +237,9 @@ without using script tags
 .B \-\-process\-begin \fIcode\fP
 .TP
 .PD 1
-.B \-B \fIcode\fP
+.B \-B \fIbegin_code\fP
 Run PHP 
-.IR code
+.IR begin_code
 before processing input lines
 .TP
 .PD 0
@@ -262,9 +264,9 @@ for every input line
 .B \-\-process\-end \fIcode\fP
 .TP
 .PD 1
-.B \-E \fIcode\fP
+.B \-E \fIend_code\fP
 Run PHP 
-.IR code
+.IR end_code
 after processing all input lines
 .TP
 .PD 0
@@ -279,14 +281,14 @@ Output HTML syntax highlighted source
 .TP
 .PD 1
 .B \-S \fIaddr:port\fP
-Start embedded Webserver on the given local address and port
+Start built-in web server on the given local address and port
 .TP
 .PD 0
 .B \-\-docroot \fIdocroot\fP
 .TP
 .PD 1
 .B \-t \fIdocroot\fP
-Specify the document root to be used by the embedded web server
+Specify the document root to be used by the built-in web server
 .TP
 .PD 0
 .B \-\-version
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index c01f3705b..aa300ce88 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -498,6 +498,7 @@ static void php_cli_usage(char *argv0)
 				"   %s [options] -r <code> [--] [args...]\n"
 				"   %s [options] [-B <begin_code>] -R <code> [-E <end_code>] [--] [args...]\n"
 				"   %s [options] [-B <begin_code>] -F <file> [-E <end_code>] [--] [args...]\n"
+				"   %s [options] -S <addr>:<port> [-t docroot]\n"
 				"   %s [options] -- [args...]\n"
 				"   %s [options] -a\n"
 				"\n"
@@ -539,7 +540,7 @@ static void php_cli_usage(char *argv0)
 				"  --rz <name>      Show information about Zend extension <name>.\n"
 				"  --ri <name>      Show configuration for extension <name>.\n"
 				"\n"
-				, prog, prog, prog, prog, prog, prog);
+				, prog, prog, prog, prog, prog, prog, prog);
 }
 /* }}} */
 
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 903f04212..4da55acc6 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -20,6 +20,7 @@
 /* $Id: php_cli.c 306938 2011-01-01 02:17:06Z felipe $ */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <fcntl.h>
 #include <assert.h>
 
@@ -192,17 +193,17 @@ typedef struct php_cli_server {
 	HashTable clients;
 } php_cli_server;
 
-typedef struct php_cli_server_http_reponse_status_code_pair {
+typedef struct php_cli_server_http_response_status_code_pair {
 	int code;
 	const char *str;
-} php_cli_server_http_reponse_status_code_pair;
+} php_cli_server_http_response_status_code_pair;
 
 typedef struct php_cli_server_ext_mime_type_pair {
 	const char *ext;
 	const char *mime_type;
 } php_cli_server_ext_mime_type_pair;
 
-static php_cli_server_http_reponse_status_code_pair status_map[] = {
+static php_cli_server_http_response_status_code_pair status_map[] = {
 	{ 100, "Continue" },
 	{ 101, "Switching Protocols" },
 	{ 200, "OK" },
@@ -249,7 +250,7 @@ static php_cli_server_http_reponse_status_code_pair status_map[] = {
 	{ 511, "Network Authentication Required" },
 };
 
-static php_cli_server_http_reponse_status_code_pair template_map[] = {
+static php_cli_server_http_response_status_code_pair template_map[] = {
 	{ 400, "<h1>%s</h1><p>Your browser sent a request that this server could not understand.</p>" },
 	{ 404, "<h1>%s</h1><p>The requested resource %s was not found on this server.</p>" },
 	{ 500, "<h1>%s</h1><p>The server is temporarily unavailable.</p>" },
@@ -333,28 +334,43 @@ static char *get_last_error() /* {{{ */
 	return pestrdup(strerror(errno), 1);
 } /* }}} */
 
+static int status_comp(const void *a, const void *b) /* {{{ */
+{
+	const php_cli_server_http_response_status_code_pair *pa = (const php_cli_server_http_response_status_code_pair *) a;
+	const php_cli_server_http_response_status_code_pair *pb = (const php_cli_server_http_response_status_code_pair *) b;
+
+	if (pa->code < pb->code) {
+		return -1;
+	} else if (pa->code > pb->code) {
+		return 1;
+	}
+
+	return 0;
+} /* }}} */
+
 static const char *get_status_string(int code) /* {{{ */
 {
-	size_t e = (sizeof(status_map) / sizeof(php_cli_server_http_reponse_status_code_pair));
-	size_t s = 0;
+	php_cli_server_http_response_status_code_pair needle, *result = NULL;
 
-	while (e != s) {
-		size_t c = MIN((e + s + 1) / 2, e - 1);
-		int d = status_map[c].code;
-		if (d > code) {
-			e = c;
-		} else if (d < code) {
-			s = c;
-		} else {
-			return status_map[c].str;
-		}
+	needle.code = code;
+	needle.str = NULL;
+
+	result = bsearch(&needle, status_map, sizeof(status_map) / sizeof(needle), sizeof(needle), status_comp);
+
+	if (result) {
+		return result->str;
 	}
-	return NULL;
+
+	/* Returning NULL would require complicating append_http_status_line() to
+	 * not segfault in that case, so let's just return a placeholder, since RFC
+	 * 2616 requires a reason phrase. This is basically what a lot of other Web
+	 * servers do in this case anyway. */
+	return "Unknown Status Code";
 } /* }}} */
 
 static const char *get_template_string(int code) /* {{{ */
 {
-	size_t e = (sizeof(template_map) / sizeof(php_cli_server_http_reponse_status_code_pair));
+	size_t e = (sizeof(template_map) / sizeof(php_cli_server_http_response_status_code_pair));
 	size_t s = 0;
 
 	while (e != s) {
@@ -392,7 +408,7 @@ static void append_essential_headers(smart_str* buffer, php_cli_server_client *c
 {
 	{
 		char **val;
-		if (SUCCESS == zend_hash_find(&client->request.headers, "Host", sizeof("Host"), (void**)&val)) {
+		if (SUCCESS == zend_hash_find(&client->request.headers, "host", sizeof("host"), (void**)&val)) {
 			smart_str_appendl_ex(buffer, "Host", sizeof("Host") - 1, persistent);
 			smart_str_appendl_ex(buffer, ": ", sizeof(": ") - 1, persistent);
 			smart_str_appends_ex(buffer, *val, persistent);
@@ -542,7 +558,7 @@ static char *sapi_cli_server_read_cookies(TSRMLS_D) /* {{{ */
 {
 	php_cli_server_client *client = SG(server_context);
 	char **val;
-	if (FAILURE == zend_hash_find(&client->request.headers, "Cookie", sizeof("Cookie"), (void**)&val)) {
+	if (FAILURE == zend_hash_find(&client->request.headers, "cookie", sizeof("cookie"), (void**)&val)) {
 		return NULL;
 	}
 	return *val;
@@ -1309,7 +1325,7 @@ static void php_cli_server_request_translate_vpath(php_cli_server_request *reque
 	static const char *index_files[] = { "index.php", "index.html", NULL };
 	char *buf = safe_pemalloc(1, request->vpath_len, 1 + document_root_len + 1 + sizeof("index.html"), 1);
 	char *p = buf, *prev_path = NULL, *q, *vpath;
-	size_t prev_path_len;
+	size_t prev_path_len = 0;
 	int  is_static_file = 0;
 
 	if (!buf) {
@@ -1540,12 +1556,9 @@ static int php_cli_server_client_read_request_on_header_value(php_http_parser *p
 		return 1;
 	}
 	{
-		char *header_name = client->current_header_name;
-		size_t header_name_len = client->current_header_name_len;
-		char c = header_name[header_name_len];
-		header_name[header_name_len] = '\0';
-		zend_hash_add(&client->request.headers, header_name, header_name_len + 1, &value, sizeof(char *), NULL);
-		header_name[header_name_len] = c;
+		char *header_name = zend_str_tolower_dup(client->current_header_name, client->current_header_name_len);
+		zend_hash_add(&client->request.headers, header_name, client->current_header_name_len + 1, &value, sizeof(char *), NULL);
+		efree(header_name);
 	}
 
 	if (client->current_header_name_allocated) {
@@ -1703,7 +1716,7 @@ static void php_cli_server_client_populate_request_info(const php_cli_server_cli
 	request_info->post_data = client->request.content;
 	request_info->content_length = request_info->post_data_length = client->request.content_len;
 	request_info->auth_user = request_info->auth_password = request_info->auth_digest = NULL;
-	if (SUCCESS == zend_hash_find(&client->request.headers, "Content-Type", sizeof("Content-Type"), (void**)&val)) {
+	if (SUCCESS == zend_hash_find(&client->request.headers, "content-type", sizeof("content-type"), (void**)&val)) {
 		request_info->content_type = *val;
 	}
 } /* }}} */
@@ -1941,7 +1954,7 @@ static int php_cli_server_begin_send_static(php_cli_server *server, php_cli_serv
 static int php_cli_server_request_startup(php_cli_server *server, php_cli_server_client *client TSRMLS_DC) { /* {{{ */
 	char **auth;
 	php_cli_server_client_populate_request_info(client, &SG(request_info));
-	if (SUCCESS == zend_hash_find(&client->request.headers, "Authorization", sizeof("Authorization"), (void**)&auth)) {
+	if (SUCCESS == zend_hash_find(&client->request.headers, "authorization", sizeof("authorization"), (void**)&auth)) {
 		php_handle_auth_data(*auth TSRMLS_CC);
 	}
 	SG(sapi_headers).http_response_code = 200;
diff --git a/sapi/cli/tests/bug65066_100.phpt b/sapi/cli/tests/bug65066_100.phpt
new file mode 100644
index 000000000..3a97c7e91
--- /dev/null
+++ b/sapi/cli/tests/bug65066_100.phpt
@@ -0,0 +1,39 @@
+--TEST--
+Bug #65066 (Cli server not responsive when responding with 422 http status code): 100 status code
+--INI--
+allow_url_fopen=1
+--SKIPIF--
+<?php
+include "skipif.inc"; 
+?>
+--FILE--
+<?php
+include "php_cli_server.inc";
+php_cli_server_start('http_response_code(100);');
+
+list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS);
+$port = intval($port)?:80;
+
+$fp = fsockopen($host, $port, $errno, $errstr, 0.5);
+if (!$fp) {
+  die("connect failed");
+}
+
+if(fwrite($fp, <<<HEADER
+GET / HTTP/1.1
+Host: {$host}
+
+
+HEADER
+)) {
+	while (!feof($fp)) {
+		echo fgets($fp);
+	}
+}
+?>
+--EXPECTF--
+HTTP/1.1 100 Continue
+Host: %s
+Connection: close
+X-Powered-By: PHP/%s
+Content-type: text/html
diff --git a/sapi/cli/tests/bug65066_422.phpt b/sapi/cli/tests/bug65066_422.phpt
new file mode 100644
index 000000000..2552d1d11
--- /dev/null
+++ b/sapi/cli/tests/bug65066_422.phpt
@@ -0,0 +1,39 @@
+--TEST--
+Bug #65066 (Cli server not responsive when responding with 422 http status code): 422 status code
+--INI--
+allow_url_fopen=1
+--SKIPIF--
+<?php
+include "skipif.inc"; 
+?>
+--FILE--
+<?php
+include "php_cli_server.inc";
+php_cli_server_start('http_response_code(422);');
+
+list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS);
+$port = intval($port)?:80;
+
+$fp = fsockopen($host, $port, $errno, $errstr, 0.5);
+if (!$fp) {
+  die("connect failed");
+}
+
+if(fwrite($fp, <<<HEADER
+GET / HTTP/1.1
+Host: {$host}
+
+
+HEADER
+)) {
+	while (!feof($fp)) {
+		echo fgets($fp);
+	}
+}
+?>
+--EXPECTF--
+HTTP/1.1 422 Unknown Status Code
+Host: %s
+Connection: close
+X-Powered-By: PHP/%s
+Content-type: text/html
diff --git a/sapi/cli/tests/bug65066_511.phpt b/sapi/cli/tests/bug65066_511.phpt
new file mode 100644
index 000000000..aa4a9a003
--- /dev/null
+++ b/sapi/cli/tests/bug65066_511.phpt
@@ -0,0 +1,39 @@
+--TEST--
+Bug #65066 (Cli server not responsive when responding with 422 http status code): 511 status code
+--INI--
+allow_url_fopen=1
+--SKIPIF--
+<?php
+include "skipif.inc"; 
+?>
+--FILE--
+<?php
+include "php_cli_server.inc";
+php_cli_server_start('http_response_code(511);');
+
+list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS);
+$port = intval($port)?:80;
+
+$fp = fsockopen($host, $port, $errno, $errstr, 0.5);
+if (!$fp) {
+  die("connect failed");
+}
+
+if(fwrite($fp, <<<HEADER
+GET / HTTP/1.1
+Host: {$host}
+
+
+HEADER
+)) {
+	while (!feof($fp)) {
+		echo fgets($fp);
+	}
+}
+?>
+--EXPECTF--
+HTTP/1.1 511 Network Authentication Required
+Host: %s
+Connection: close
+X-Powered-By: PHP/%s
+Content-type: text/html
diff --git a/sapi/cli/tests/bug65633.phpt b/sapi/cli/tests/bug65633.phpt
new file mode 100644
index 000000000..55834095b
--- /dev/null
+++ b/sapi/cli/tests/bug65633.phpt
@@ -0,0 +1,48 @@
+--TEST--
+Bug #65633 (built-in server treat some http headers as case-sensitive)
+--SKIPIF--
+<?php
+include "skipif.inc";
+?>
+--FILE--
+<?php
+include "php_cli_server.inc";
+php_cli_server_start(<<<'PHP'
+var_dump($_COOKIE, $_SERVER['HTTP_FOO']);
+PHP
+);
+
+list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS);
+$port = intval($port)?:80;
+
+$fp = fsockopen($host, $port, $errno, $errstr, 0.5);
+if (!$fp) {
+  die("connect failed");
+}
+
+if(fwrite($fp, <<<HEADER
+GET / HTTP/1.1
+cookie: foo=bar
+foo: bar
+
+
+HEADER
+)) {
+    while (!feof($fp)) {
+        echo fgets($fp);
+    }
+}
+
+fclose($fp);
+?>
+--EXPECTF--
+HTTP/1.1 200 OK
+Connection: close
+X-Powered-By: %s
+Content-type: text/html
+
+array(1) {
+  ["foo"]=>
+  string(3) "bar"
+}
+string(3) "bar"
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index 6191c329b..579f7c284 100644
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -563,6 +563,26 @@ if test "$PHP_FPM" != "no"; then
   [  --with-fpm-group[=GRP]  Set the group for php-fpm to run as. For a system user, this 
                   should usually be set to match the fpm username (default: nobody)], nobody, no)
 
+  PHP_ARG_WITH(fpm-systemd,,
+  [  --with-fpm-systemd      Activate systemd integration], no, no)
+
+  if test "$PHP_FPM_SYSTEMD" != "no" ; then
+    AC_CHECK_LIB(systemd-daemon, sd_notify, SYSTEMD_LIBS="-lsystemd-daemon")
+    AC_CHECK_HEADERS(systemd/sd-daemon.h, [HAVE_SD_DAEMON_H="yes"], [HAVE_SD_DAEMON_H="no"])
+    if test $HAVE_SD_DAEMON_H = "no" || test -z "${SYSTEMD_LIBS}"; then
+      AC_MSG_ERROR([Your system does not support systemd.])
+    else
+      AC_DEFINE(HAVE_SYSTEMD, 1, [FPM use systemd integration])
+      PHP_FPM_SD_FILES="fpm/fpm_systemd.c"
+      PHP_ADD_LIBRARY(systemd-daemon)
+      php_fpm_systemd=notify
+    fi
+  else
+    php_fpm_systemd=simple
+  fi
+  PHP_SUBST_OLD(php_fpm_systemd)
+  AC_DEFINE_UNQUOTED(PHP_FPM_SYSTEMD, "$php_fpm_systemd", [fpm systemd service type])
+
   if test -z "$PHP_FPM_USER" -o "$PHP_FPM_USER" = "yes" -o "$PHP_FPM_USER" = "no"; then
     php_fpm_user="nobody"
   else
@@ -635,7 +655,7 @@ if test "$PHP_FPM" != "no"; then
 		fpm/events/port.c \
   "
 
-  PHP_SELECT_SAPI(fpm, program, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES, $PHP_FPM_CFLAGS, '$(SAPI_FPM_PATH)')
+  PHP_SELECT_SAPI(fpm, program, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES $PHP_FPM_SD_FILES, $PHP_FPM_CFLAGS, '$(SAPI_FPM_PATH)')
 
   case $host_alias in
       *aix*)
diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index 25e2cc43a..cd5fc34d0 100644
--- a/sapi/fpm/fpm/fpm_conf.c
+++ b/sapi/fpm/fpm/fpm_conf.c
@@ -45,6 +45,10 @@
 #include "fpm_log.h"
 #include "fpm_events.h"
 #include "zlog.h"
+#ifdef HAVE_SYSTEMD
+#include "fpm_systemd.h"
+#endif
+
 
 #define STR2STR(a) (a ? a : "undefined")
 #define BOOL2STR(a) (a ? "yes" : "no")
@@ -73,6 +77,10 @@ struct fpm_global_config_s fpm_global_config = {
 #endif
 	.process_max = 0,
 	.process_priority = 64, /* 64 means unset */
+#ifdef HAVE_SYSTEMD
+	.systemd_watchdog = 0,
+	.systemd_interval = -1, /* -1 means not set */
+#endif
 };
 static struct fpm_worker_pool_s *current_wp = NULL;
 static int ini_recursion = 0;
@@ -100,6 +108,9 @@ static struct ini_value_parser_s ini_fpm_global_options[] = {
 	{ "rlimit_files",                &fpm_conf_set_integer,         GO(rlimit_files) },
 	{ "rlimit_core",                 &fpm_conf_set_rlimit_core,     GO(rlimit_core) },
 	{ "events.mechanism",            &fpm_conf_set_string,          GO(events_mechanism) },
+#ifdef HAVE_SYSTEMD
+	{ "systemd_interval",            &fpm_conf_set_time,            GO(systemd_interval) },
+#endif
 	{ 0, 0, 0 }
 };
 
@@ -540,12 +551,17 @@ static char *fpm_conf_set_array(zval *key, zval *value, void **config, int conve
 	kv->key = strdup(Z_STRVAL_P(key));
 
 	if (!kv->key) {
+		free(kv);
 		return "fpm_conf_set_array: strdup(key) failed";
 	}
 
 	if (convert_to_bool) {
 		char *err = fpm_conf_set_boolean(value, &subconf, 0);
-		if (err) return err;
+		if (err) {
+			free(kv->key);
+			free(kv);
+			return err;
+		}
 		kv->value = strdup(b ? "1" : "0");
 	} else {
 		kv->value = strdup(Z_STRVAL_P(value));
@@ -556,6 +572,7 @@ static char *fpm_conf_set_array(zval *key, zval *value, void **config, int conve
 
 	if (!kv->value) {
 		free(kv->key);
+		free(kv);
 		return "fpm_conf_set_array: strdup(value) failed";
 	}
 
@@ -578,6 +595,7 @@ static void *fpm_worker_pool_config_alloc() /* {{{ */
 	wp->config = malloc(sizeof(struct fpm_worker_pool_config_s));
 
 	if (!wp->config) { 
+		fpm_worker_pool_free(wp);
 		return 0;
 	}
 
@@ -679,7 +697,7 @@ static int fpm_evaluate_full_path(char **path, struct fpm_worker_pool_s *wp, cha
 		if (tmp != NULL) {
 
 			if (tmp != *path) {
-				zlog(ZLOG_ERROR, "'$prefix' must be use at the begining of the value");
+				zlog(ZLOG_ERROR, "'$prefix' must be use at the beginning of the value");
 				return -1;
 			}
 
@@ -1002,7 +1020,7 @@ static int fpm_conf_process_all_pools() /* {{{ */
 			nb_ext = 0;
 
 			/* find the number of extensions */
-			while ((ext = strtok(limit_extensions, " \t"))) {
+			while (strtok(limit_extensions, " \t")) {
 				limit_extensions = NULL;
 				nb_ext++;
 			}
@@ -1024,8 +1042,8 @@ static int fpm_conf_process_all_pools() /* {{{ */
 				nb_ext = 0;
 
 				/* parse the string and save the extension in the array */
-				while ((ext = strtok(security_limit_extensions, " \t"))) {
-					security_limit_extensions = NULL;
+				while ((ext = strtok(limit_extensions, " \t"))) {
+					limit_extensions = NULL;
 					wp->limit_extensions[nb_ext++] = strdup(ext);
 				}
 
@@ -1107,6 +1125,7 @@ int fpm_conf_write_pid() /* {{{ */
 
 		if (len != write(fd, buf, len)) {
 			zlog(ZLOG_SYSERROR, "Unable to write to the PID file.");
+			close(fd);
 			return -1;
 		}
 		close(fd);
@@ -1144,6 +1163,12 @@ static int fpm_conf_post_process(int force_daemon TSRMLS_DC) /* {{{ */
 		fpm_global_config.error_log = strdup("log/php-fpm.log");
 	}
 
+#ifdef HAVE_SYSTEMD
+	if (0 > fpm_systemd_conf()) {
+		return -1;
+	}
+#endif
+
 #ifdef HAVE_SYSLOG_H
 	if (!fpm_global_config.syslog_ident) {
 		fpm_global_config.syslog_ident = strdup("php-fpm");
@@ -1460,6 +1485,7 @@ int fpm_conf_load_ini_file(char *filename TSRMLS_DC) /* {{{ */
 
 	if (ini_recursion++ > 4) {
 		zlog(ZLOG_ERROR, "failed to include more than 5 files recusively");
+		close(fd);
 		return -1;
 	}
 
@@ -1531,6 +1557,9 @@ static void fpm_conf_dump() /* {{{ */
 	zlog(ZLOG_NOTICE, "\trlimit_files = %d",                fpm_global_config.rlimit_files);
 	zlog(ZLOG_NOTICE, "\trlimit_core = %d",                 fpm_global_config.rlimit_core);
 	zlog(ZLOG_NOTICE, "\tevents.mechanism = %s",            fpm_event_machanism_name());
+#ifdef HAVE_SYSTEMD
+	zlog(ZLOG_NOTICE, "\tsystemd_interval = %ds",           fpm_global_config.systemd_interval/1000);
+#endif
 	zlog(ZLOG_NOTICE, " ");
 
 	for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
diff --git a/sapi/fpm/fpm/fpm_conf.h b/sapi/fpm/fpm/fpm_conf.h
index dc54133d4..efd65dc6d 100644
--- a/sapi/fpm/fpm/fpm_conf.h
+++ b/sapi/fpm/fpm/fpm_conf.h
@@ -40,6 +40,10 @@ struct fpm_global_config_s {
 	int rlimit_files;
 	int rlimit_core;
 	char *events_mechanism;
+#ifdef HAVE_SYSTEMD
+	int systemd_watchdog;
+	int systemd_interval;
+#endif
 };
 
 extern struct fpm_global_config_s fpm_global_config;
diff --git a/sapi/fpm/fpm/fpm_events.c b/sapi/fpm/fpm/fpm_events.c
index d5835f0f7..ce5d543f9 100644
--- a/sapi/fpm/fpm/fpm_events.c
+++ b/sapi/fpm/fpm/fpm_events.c
@@ -29,6 +29,10 @@
 #include "events/port.h"
 #include "events/kqueue.h"
 
+#ifdef HAVE_SYSTEMD
+#include "fpm_systemd.h"
+#endif
+
 #define fpm_event_set_timeout(ev, now) timeradd(&(now), &(ev)->frequency, &(ev)->timeout);
 
 static void fpm_event_cleanup(int which, void *arg);
@@ -361,6 +365,10 @@ void fpm_event_loop(int err) /* {{{ */
 
 		zlog(ZLOG_DEBUG, "%zu bytes have been reserved in SHM", fpm_shm_get_size_allocated());
 		zlog(ZLOG_NOTICE, "ready to handle connections");
+
+#ifdef HAVE_SYSTEMD
+		fpm_systemd_heartbeat(NULL, 0, NULL);
+#endif
 	}
 
 	while (1) {
diff --git a/sapi/fpm/fpm/fpm_log.c b/sapi/fpm/fpm/fpm_log.c
index 6b014b500..4e1a057db 100644
--- a/sapi/fpm/fpm/fpm_log.c
+++ b/sapi/fpm/fpm/fpm_log.c
@@ -57,7 +57,9 @@ int fpm_log_open(int reopen) /* {{{ */
 			wp->log_fd = fd;
 		}
 
-		fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+		if (0 > fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC)) {
+			zlog(ZLOG_WARNING, "failed to change attribute of access_log");
+		}
 	}
 
 	return ret;
@@ -237,7 +239,7 @@ int fpm_log_write(char *log_format TSRMLS_DC) /* {{{ */
 
 				case 'f': /* script */
 					if (!test) {
-						len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s",  proc.script_filename && *proc.script_filename ? proc.script_filename : "-");
+						len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s",  *proc.script_filename ? proc.script_filename : "-");
 					}
 					break;
 
@@ -249,7 +251,7 @@ int fpm_log_write(char *log_format TSRMLS_DC) /* {{{ */
 
 				case 'm': /* method */
 					if (!test) {
-						len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.request_method && *proc.request_method ? proc.request_method : "-");
+						len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", *proc.request_method ? proc.request_method : "-");
 					}
 					break;
 
@@ -347,19 +349,19 @@ int fpm_log_write(char *log_format TSRMLS_DC) /* {{{ */
 
 				case 'q': /* query_string */
 					if (!test) {
-						len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.query_string ? proc.query_string : "");
+						len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.query_string);
 					}
 					break;
 
 				case 'Q': /* '?' */
 					if (!test) {
-						len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.query_string && *proc.query_string  ? "?" : "");
+						len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", *proc.query_string  ? "?" : "");
 					}
 					break;
 
 				case 'r': /* request URI */
 					if (!test) {
-						len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.request_uri ? proc.request_uri : "-");
+						len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.request_uri);
 					}
 					break;
 
@@ -397,7 +399,7 @@ int fpm_log_write(char *log_format TSRMLS_DC) /* {{{ */
 
 				case 'u': /* remote user */
 					if (!test) {
-						len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.auth_user ? proc.auth_user : "-");
+						len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.auth_user);
 					}
 					break;
 
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index 61088c465..043e0e00a 100644
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -1098,7 +1098,7 @@ static void init_request_info(TSRMLS_D)
 
 #define APACHE_PROXY_FCGI_PREFIX "proxy:fcgi://"
 		/* Fix proxy URLs in SCRIPT_FILENAME generated by Apache mod_proxy_fcgi:
-		 *     proxy:fcgi://localhost:9000/some-dir/info.php/test
+		 *     proxy:fcgi://localhost:9000/some-dir/info.php/test?foo=bar
 		 * should be changed to:
 		 *     /some-dir/info.php/test
 		 * See: http://bugs.php.net/bug.php?id=54152
@@ -1118,6 +1118,11 @@ static void init_request_info(TSRMLS_D)
 				memmove(env_script_filename, p, strlen(p) + 1);
 				apache_was_here = 1;
 			}
+			/* ignore query string if sent by Apache (RewriteRule) */
+			p = strchr(env_script_filename, '?');
+			if (p) {
+				*p =0;
+			}
 		}
 
 		if (CGIG(fix_pathinfo)) {
@@ -1173,119 +1178,123 @@ static void init_request_info(TSRMLS_D)
 				int len = script_path_translated_len;
 				char *ptr;
 
-				while ((ptr = strrchr(pt, '/')) || (ptr = strrchr(pt, '\\'))) {
-					*ptr = 0;
-					if (stat(pt, &st) == 0 && S_ISREG(st.st_mode)) {
-						/*
-						 * okay, we found the base script!
-						 * work out how many chars we had to strip off;
-						 * then we can modify PATH_INFO
-						 * accordingly
-						 *
-						 * we now have the makings of
-						 * PATH_INFO=/test
-						 * SCRIPT_FILENAME=/docroot/info.php
-						 *
-						 * we now need to figure out what docroot is.
-						 * if DOCUMENT_ROOT is set, this is easy, otherwise,
-						 * we have to play the game of hide and seek to figure
-						 * out what SCRIPT_NAME should be
-						 */
-						int ptlen = strlen(pt);
-						int slen = len - ptlen;
-						int pilen = env_path_info ? strlen(env_path_info) : 0;
-						int tflag = 0;
-						char *path_info;
-						if (apache_was_here) {
-							/* recall that PATH_INFO won't exist */
-							path_info = script_path_translated + ptlen;
-							tflag = (slen != 0 && (!orig_path_info || strcmp(orig_path_info, path_info) != 0));
-						} else {
-							path_info = env_path_info ? env_path_info + pilen - slen : NULL;
-							tflag = (orig_path_info != path_info);
-						}
+				if (pt) {
+					while ((ptr = strrchr(pt, '/')) || (ptr = strrchr(pt, '\\'))) {
+						*ptr = 0;
+						if (stat(pt, &st) == 0 && S_ISREG(st.st_mode)) {
+							/*
+							 * okay, we found the base script!
+							 * work out how many chars we had to strip off;
+							 * then we can modify PATH_INFO
+							 * accordingly
+							 *
+							 * we now have the makings of
+							 * PATH_INFO=/test
+							 * SCRIPT_FILENAME=/docroot/info.php
+							 *
+							 * we now need to figure out what docroot is.
+							 * if DOCUMENT_ROOT is set, this is easy, otherwise,
+							 * we have to play the game of hide and seek to figure
+							 * out what SCRIPT_NAME should be
+							 */
+							int ptlen = strlen(pt);
+							int slen = len - ptlen;
+							int pilen = env_path_info ? strlen(env_path_info) : 0;
+							int tflag = 0;
+							char *path_info;
+							if (apache_was_here) {
+								/* recall that PATH_INFO won't exist */
+								path_info = script_path_translated + ptlen;
+								tflag = (slen != 0 && (!orig_path_info || strcmp(orig_path_info, path_info) != 0));
+							} else {
+								path_info = env_path_info ? env_path_info + pilen - slen : NULL;
+								tflag = (orig_path_info != path_info);
+							}
 
-						if (tflag) {
-							if (orig_path_info) {
-								char old;
-
-								_sapi_cgibin_putenv("ORIG_PATH_INFO", orig_path_info TSRMLS_CC);
-								old = path_info[0];
-								path_info[0] = 0;
-								if (!orig_script_name ||
-									strcmp(orig_script_name, env_path_info) != 0) {
-									if (orig_script_name) {
-										_sapi_cgibin_putenv("ORIG_SCRIPT_NAME", orig_script_name TSRMLS_CC);
+							if (tflag) {
+								if (orig_path_info) {
+									char old;
+
+									_sapi_cgibin_putenv("ORIG_PATH_INFO", orig_path_info TSRMLS_CC);
+									old = path_info[0];
+									path_info[0] = 0;
+									if (!orig_script_name ||
+										strcmp(orig_script_name, env_path_info) != 0) {
+										if (orig_script_name) {
+											_sapi_cgibin_putenv("ORIG_SCRIPT_NAME", orig_script_name TSRMLS_CC);
+										}
+										SG(request_info).request_uri = _sapi_cgibin_putenv("SCRIPT_NAME", env_path_info TSRMLS_CC);
+									} else {
+										SG(request_info).request_uri = orig_script_name;
 									}
-									SG(request_info).request_uri = _sapi_cgibin_putenv("SCRIPT_NAME", env_path_info TSRMLS_CC);
-								} else {
-									SG(request_info).request_uri = orig_script_name;
+									path_info[0] = old;
 								}
-								path_info[0] = old;
+								env_path_info = _sapi_cgibin_putenv("PATH_INFO", path_info TSRMLS_CC);
 							}
-							env_path_info = _sapi_cgibin_putenv("PATH_INFO", path_info TSRMLS_CC);
-						}
-						if (!orig_script_filename ||
-							strcmp(orig_script_filename, pt) != 0) {
-							if (orig_script_filename) {
-								_sapi_cgibin_putenv("ORIG_SCRIPT_FILENAME", orig_script_filename TSRMLS_CC);
-							}
-							script_path_translated = _sapi_cgibin_putenv("SCRIPT_FILENAME", pt TSRMLS_CC);
-						}
-						TRANSLATE_SLASHES(pt);
-
-						/* figure out docroot
-						 * SCRIPT_FILENAME minus SCRIPT_NAME
-						 */
-						if (env_document_root) {
-							int l = strlen(env_document_root);
-							int path_translated_len = 0;
-							char *path_translated = NULL;
-
-							if (l && env_document_root[l - 1] == '/') {
-								--l;
+							if (!orig_script_filename ||
+								strcmp(orig_script_filename, pt) != 0) {
+								if (orig_script_filename) {
+									_sapi_cgibin_putenv("ORIG_SCRIPT_FILENAME", orig_script_filename TSRMLS_CC);
+								}
+								script_path_translated = _sapi_cgibin_putenv("SCRIPT_FILENAME", pt TSRMLS_CC);
 							}
+							TRANSLATE_SLASHES(pt);
 
-							/* we have docroot, so we should have:
-							 * DOCUMENT_ROOT=/docroot
-							 * SCRIPT_FILENAME=/docroot/info.php
+							/* figure out docroot
+							 * SCRIPT_FILENAME minus SCRIPT_NAME
 							 */
+							if (env_document_root) {
+								int l = strlen(env_document_root);
+								int path_translated_len = 0;
+								char *path_translated = NULL;
 
-							/* PATH_TRANSLATED = DOCUMENT_ROOT + PATH_INFO */
-							path_translated_len = l + (env_path_info ? strlen(env_path_info) : 0);
-							path_translated = (char *) emalloc(path_translated_len + 1);
-							memcpy(path_translated, env_document_root, l);
-							if (env_path_info) {
-								memcpy(path_translated + l, env_path_info, (path_translated_len - l));
-							}
-							path_translated[path_translated_len] = '\0';
-							if (orig_path_translated) {
-								_sapi_cgibin_putenv("ORIG_PATH_TRANSLATED", orig_path_translated TSRMLS_CC);
-							}
-							env_path_translated = _sapi_cgibin_putenv("PATH_TRANSLATED", path_translated TSRMLS_CC);
-							efree(path_translated);
-						} else if (	env_script_name &&
-									strstr(pt, env_script_name)
-						) {
-							/* PATH_TRANSLATED = PATH_TRANSLATED - SCRIPT_NAME + PATH_INFO */
-							int ptlen = strlen(pt) - strlen(env_script_name);
-							int path_translated_len = ptlen + (env_path_info ? strlen(env_path_info) : 0);
-							char *path_translated = NULL;
-
-							path_translated = (char *) emalloc(path_translated_len + 1);
-							memcpy(path_translated, pt, ptlen);
-							if (env_path_info) {
-								memcpy(path_translated + ptlen, env_path_info, path_translated_len - ptlen);
-							}
-							path_translated[path_translated_len] = '\0';
-							if (orig_path_translated) {
-								_sapi_cgibin_putenv("ORIG_PATH_TRANSLATED", orig_path_translated TSRMLS_CC);
+								if (l && env_document_root[l - 1] == '/') {
+									--l;
+								}
+
+								/* we have docroot, so we should have:
+								 * DOCUMENT_ROOT=/docroot
+								 * SCRIPT_FILENAME=/docroot/info.php
+								 */
+
+								/* PATH_TRANSLATED = DOCUMENT_ROOT + PATH_INFO */
+								path_translated_len = l + (env_path_info ? strlen(env_path_info) : 0);
+								path_translated = (char *) emalloc(path_translated_len + 1);
+								memcpy(path_translated, env_document_root, l);
+								if (env_path_info) {
+									memcpy(path_translated + l, env_path_info, (path_translated_len - l));
+								}
+								path_translated[path_translated_len] = '\0';
+								if (orig_path_translated) {
+									_sapi_cgibin_putenv("ORIG_PATH_TRANSLATED", orig_path_translated TSRMLS_CC);
+								}
+								env_path_translated = _sapi_cgibin_putenv("PATH_TRANSLATED", path_translated TSRMLS_CC);
+								efree(path_translated);
+							} else if (	env_script_name &&
+										strstr(pt, env_script_name)
+							) {
+								/* PATH_TRANSLATED = PATH_TRANSLATED - SCRIPT_NAME + PATH_INFO */
+								int ptlen = strlen(pt) - strlen(env_script_name);
+								int path_translated_len = ptlen + (env_path_info ? strlen(env_path_info) : 0);
+								char *path_translated = NULL;
+
+								path_translated = (char *) emalloc(path_translated_len + 1);
+								memcpy(path_translated, pt, ptlen);
+								if (env_path_info) {
+									memcpy(path_translated + ptlen, env_path_info, path_translated_len - ptlen);
+								}
+								path_translated[path_translated_len] = '\0';
+								if (orig_path_translated) {
+									_sapi_cgibin_putenv("ORIG_PATH_TRANSLATED", orig_path_translated TSRMLS_CC);
+								}
+								env_path_translated = _sapi_cgibin_putenv("PATH_TRANSLATED", path_translated TSRMLS_CC);
+								efree(path_translated);
 							}
-							env_path_translated = _sapi_cgibin_putenv("PATH_TRANSLATED", path_translated TSRMLS_CC);
-							efree(path_translated);
+							break;
 						}
-						break;
 					}
+				} else {
+					ptr = NULL;
 				}
 				if (!ptr) {
 					/*
diff --git a/sapi/fpm/fpm/fpm_signals.c b/sapi/fpm/fpm/fpm_signals.c
index 8993a860a..c5d0692f1 100644
--- a/sapi/fpm/fpm/fpm_signals.c
+++ b/sapi/fpm/fpm/fpm_signals.c
@@ -145,7 +145,9 @@ static void sig_soft_quit(int signo) /* {{{ */
 
 	/* closing fastcgi listening socket will force fcgi_accept() exit immediately */
 	close(0);
-	socket(AF_UNIX, SOCK_STREAM, 0);
+	if (0 > socket(AF_UNIX, SOCK_STREAM, 0)) {
+		zlog(ZLOG_WARNING, "failed to create a new socket");
+	}
 	fpm_php_soft_quit();
 	errno = saved_errno;
 }
diff --git a/sapi/fpm/fpm/fpm_sockets.c b/sapi/fpm/fpm/fpm_sockets.c
index 76759e7f2..145b2550c 100644
--- a/sapi/fpm/fpm/fpm_sockets.c
+++ b/sapi/fpm/fpm/fpm_sockets.c
@@ -167,7 +167,7 @@ static int fpm_sockets_new_listening_socket(struct fpm_worker_pool_s *wp, struct
 {
 	int flags = 1;
 	int sock;
-	mode_t saved_umask;
+	mode_t saved_umask = 0;
 
 	sock = socket(sa->sa_family, SOCK_STREAM, 0);
 
@@ -176,11 +176,14 @@ static int fpm_sockets_new_listening_socket(struct fpm_worker_pool_s *wp, struct
 		return -1;
 	}
 
-	setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags));
+	if (0 > setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags))) {
+		zlog(ZLOG_WARNING, "failed to change socket attribute");
+	}
 
 	if (wp->listen_address_domain == FPM_AF_UNIX) {
 		if (fpm_socket_unix_test_connect((struct sockaddr_un *)sa, socklen) == 0) {
 			zlog(ZLOG_ERROR, "An another FPM instance seems to already listen on %s", ((struct sockaddr_un *) sa)->sun_path);
+			close(sock);
 			return -1;
 		}
 		unlink( ((struct sockaddr_un *) sa)->sun_path);
@@ -192,6 +195,7 @@ static int fpm_sockets_new_listening_socket(struct fpm_worker_pool_s *wp, struct
 		if (wp->listen_address_domain == FPM_AF_UNIX) {
 			umask(saved_umask);
 		}
+		close(sock);
 		return -1;
 	}
 
@@ -203,6 +207,7 @@ static int fpm_sockets_new_listening_socket(struct fpm_worker_pool_s *wp, struct
 		if (wp->socket_uid != -1 || wp->socket_gid != -1) {
 			if (0 > chown(path, wp->socket_uid, wp->socket_gid)) {
 				zlog(ZLOG_SYSERROR, "failed to chown() the socket '%s'", wp->config->listen_address);
+				close(sock);
 				return -1;
 			}
 		}
@@ -210,6 +215,7 @@ static int fpm_sockets_new_listening_socket(struct fpm_worker_pool_s *wp, struct
 
 	if (0 > listen(sock, wp->config->listen_backlog)) {
 		zlog(ZLOG_SYSERROR, "failed to listen to address '%s'", wp->config->listen_address);
+		close(sock);
 		return -1;
 	}
 
@@ -399,7 +405,19 @@ int fpm_socket_get_listening_queue(int sock, unsigned *cur_lq, unsigned *max_lq)
 		zlog(ZLOG_SYSERROR, "failed to retrieve TCP_INFO for socket");
 		return -1;
 	}
+#if defined(__FreeBSD__)
+	if (info.__tcpi_sacked == 0) {
+		return -1;
+	}
+
+	if (cur_lq) {
+		*cur_lq = info.__tcpi_unacked;
+	}
 
+	if (max_lq) {
+		*max_lq = info.__tcpi_sacked;
+	}
+#else
 	/* kernel >= 2.6.24 return non-zero here, that means operation is supported */
 	if (info.tcpi_sacked == 0) {
 		return -1;
@@ -412,6 +430,7 @@ int fpm_socket_get_listening_queue(int sock, unsigned *cur_lq, unsigned *max_lq)
 	if (max_lq) {
 		*max_lq = info.tcpi_sacked;
 	}
+#endif
 
 	return 0;
 }
diff --git a/sapi/fpm/fpm/fpm_stdio.c b/sapi/fpm/fpm/fpm_stdio.c
index 6a587d00e..d81e10150 100644
--- a/sapi/fpm/fpm/fpm_stdio.c
+++ b/sapi/fpm/fpm/fpm_stdio.c
@@ -34,6 +34,7 @@ int fpm_stdio_init_main() /* {{{ */
 
 	if (0 > dup2(fd, STDIN_FILENO) || 0 > dup2(fd, STDOUT_FILENO)) {
 		zlog(ZLOG_SYSERROR, "failed to init stdio: dup2()");
+		close(fd);
 		return -1;
 	}
 	close(fd);
@@ -290,11 +291,17 @@ int fpm_stdio_open_error_log(int reopen) /* {{{ */
 		fd = fpm_globals.error_log_fd; /* for FD_CLOSEXEC to work */
 	} else {
 		fpm_globals.error_log_fd = fd;
+#if HAVE_UNISTD_H
+		if (fpm_global_config.daemonize || !isatty(STDERR_FILENO)) {
+#else
 		if (fpm_global_config.daemonize) {
+#endif
 			zlog_set_fd(fpm_globals.error_log_fd);
 		}
 	}
-	fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+	if (0 > fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC)) {
+		zlog(ZLOG_WARNING, "failed to change attribute of error_log");
+	}
 	return 0;
 }
 /* }}} */
diff --git a/sapi/fpm/fpm/fpm_systemd.c b/sapi/fpm/fpm/fpm_systemd.c
new file mode 100644
index 000000000..c4d7ec15a
--- /dev/null
+++ b/sapi/fpm/fpm/fpm_systemd.c
@@ -0,0 +1,113 @@
+#include "fpm_config.h"
+
+#include <sys/types.h>
+#include <systemd/sd-daemon.h>
+
+#include "fpm.h"
+#include "fpm_clock.h"
+#include "fpm_worker_pool.h"
+#include "fpm_scoreboard.h"
+#include "zlog.h"
+#include "fpm_systemd.h"
+
+
+static void fpm_systemd() /* {{{ */
+{
+	static unsigned long int last=0;
+	struct fpm_worker_pool_s *wp;
+	unsigned long int requests=0, slow_req=0;
+	int active=0, idle=0;
+
+
+	for (wp = fpm_worker_all_pools; wp; wp = wp->next) {
+		if (wp->scoreboard) {
+			active   += wp->scoreboard->active;
+			idle     += wp->scoreboard->idle;
+			requests += wp->scoreboard->requests;
+			slow_req += wp->scoreboard->slow_rq;
+		}
+	}
+
+/*
+	zlog(ZLOG_DEBUG, "systemd %s (Processes active:%d, idle:%d, Requests:%lu, slow:%lu, Traffic:%.3greq/sec)", 
+			fpm_global_config.systemd_watchdog ? "watchdog" : "heartbeat",
+			active, idle, requests, slow_req, ((float)requests - last) * 1000.0 / fpm_global_config.systemd_interval);
+*/
+
+	if (0 > sd_notifyf(0, "READY=1\n%s"
+				"STATUS=Processes active: %d, idle: %d, Requests: %lu, slow: %lu, Traffic: %.3greq/sec",
+				fpm_global_config.systemd_watchdog ? "WATCHDOG=1\n" : "",
+				active, idle, requests, slow_req, ((float)requests - last) * 1000.0 / fpm_global_config.systemd_interval)) {
+		zlog(ZLOG_NOTICE, "failed to notify status to systemd");
+	}
+
+	last = requests;
+}
+/* }}} */
+
+void fpm_systemd_heartbeat(struct fpm_event_s *ev, short which, void *arg) /* {{{ */
+{
+	static struct fpm_event_s heartbeat;
+
+	if (fpm_globals.parent_pid != getpid()) {
+		return; /* sanity check */
+	}
+
+	if (which == FPM_EV_TIMEOUT) {
+		fpm_systemd();
+
+		return;
+	}
+
+	if (0 > sd_notifyf(0, "READY=1\n"
+			          "STATUS=Ready to handle connections\n"
+			          "MAINPID=%lu",
+			          (unsigned long) getpid())) {
+		zlog(ZLOG_WARNING, "failed to notify start to systemd");
+	} else {
+		zlog(ZLOG_DEBUG, "have notify start to systemd");
+	}
+
+	/* first call without setting which to initialize the timer */
+	if (fpm_global_config.systemd_interval > 0) {
+		fpm_event_set_timer(&heartbeat, FPM_EV_PERSIST, &fpm_systemd_heartbeat, NULL);
+		fpm_event_add(&heartbeat, fpm_global_config.systemd_interval);
+		zlog(ZLOG_NOTICE, "systemd monitor interval set to %dms", fpm_global_config.systemd_interval);
+	} else {
+		zlog(ZLOG_NOTICE, "systemd monitor disabled");
+	}
+}
+/* }}} */
+
+int fpm_systemd_conf() /* {{{ */
+{
+	char *watchdog;
+	int  interval = 0;
+
+	watchdog = getenv("WATCHDOG_USEC");
+	if (watchdog) {
+		/* usec to msec, and half the configured delay */
+		interval = (int)(atol(watchdog) / 2000L);
+		zlog(ZLOG_DEBUG, "WATCHDOG_USEC=%s, interval=%d", watchdog, interval);
+	}
+
+	if (interval > 1000) {
+		if (fpm_global_config.systemd_interval > 0) {
+			zlog(ZLOG_WARNING, "systemd_interval option ignored");
+		}
+		zlog(ZLOG_NOTICE, "systemd watchdog configured to %.3gsec", (float)interval / 1000.0);
+		fpm_global_config.systemd_watchdog = 1;
+		fpm_global_config.systemd_interval = interval;
+
+	} else if (fpm_global_config.systemd_interval < 0) {
+		/* not set => default value */
+		fpm_global_config.systemd_interval = FPM_SYSTEMD_DEFAULT_HEARTBEAT;
+
+	} else {
+		/* sec to msec */
+		fpm_global_config.systemd_interval *= 1000;
+	}
+	return 0;
+}
+/* }}} */
+
diff --git a/sapi/fpm/fpm/fpm_systemd.h b/sapi/fpm/fpm/fpm_systemd.h
new file mode 100644
index 000000000..3ee621771
--- /dev/null
+++ b/sapi/fpm/fpm/fpm_systemd.h
@@ -0,0 +1,13 @@
+#ifndef FPM_SYSTEMD_H
+#define FPM_SYSTEMD_H 1
+
+#include "fpm_events.h"
+
+/* 10s (in ms) heartbeat for systemd status */
+#define FPM_SYSTEMD_DEFAULT_HEARTBEAT (10000)
+
+void fpm_systemd_heartbeat(struct fpm_event_s *ev, short which, void *arg);
+int fpm_systemd_conf();
+
+#endif
+
diff --git a/sapi/fpm/fpm/fpm_worker_pool.c b/sapi/fpm/fpm/fpm_worker_pool.c
index 123f9893f..ebe1866c8 100644
--- a/sapi/fpm/fpm/fpm_worker_pool.c
+++ b/sapi/fpm/fpm/fpm_worker_pool.c
@@ -18,6 +18,21 @@
 
 struct fpm_worker_pool_s *fpm_worker_all_pools;
 
+void fpm_worker_pool_free(struct fpm_worker_pool_s *wp) /* {{{ */
+{
+	if (wp->config) {
+		free(wp->config);
+	}
+	if (wp->user) {
+		free(wp->user);
+	}
+	if (wp->home) {
+		free(wp->home);
+	}
+	free(wp);
+}
+/* }}} */
+
 static void fpm_worker_pool_cleanup(int which, void *arg) /* {{{ */
 {
 	struct fpm_worker_pool_s *wp, *wp_next;
@@ -29,10 +44,7 @@ static void fpm_worker_pool_cleanup(int which, void *arg) /* {{{ */
 		if ((which & FPM_CLEANUP_CHILD) == 0 && fpm_globals.parent_pid == getpid()) {
 			fpm_scoreboard_free(wp->scoreboard);
 		}
-		free(wp->config);
-		free(wp->user);
-		free(wp->home);
-		free(wp);
+		fpm_worker_pool_free(wp);
 	}
 	fpm_worker_all_pools = NULL;
 }
diff --git a/sapi/fpm/fpm/fpm_worker_pool.h b/sapi/fpm/fpm/fpm_worker_pool.h
index 6688e6d3b..05c993de4 100644
--- a/sapi/fpm/fpm/fpm_worker_pool.h
+++ b/sapi/fpm/fpm/fpm_worker_pool.h
@@ -45,6 +45,7 @@ struct fpm_worker_pool_s {
 };
 
 struct fpm_worker_pool_s *fpm_worker_pool_alloc();
+void fpm_worker_pool_free(struct fpm_worker_pool_s *wp);
 int fpm_worker_pool_init_main();
 
 extern struct fpm_worker_pool_s *fpm_worker_all_pools;
diff --git a/sapi/fpm/init.d.php-fpm.in b/sapi/fpm/init.d.php-fpm.in
index 49cce79ae..020b942f1 100644
--- a/sapi/fpm/init.d.php-fpm.in
+++ b/sapi/fpm/init.d.php-fpm.in
@@ -91,6 +91,20 @@ case "$1" in
 		fi
 	;;
 
+	status)
+		if [ ! -r $php_fpm_PID ] ; then
+			echo "php-fpm is stopped"
+			exit 0
+		fi
+
+		PID=`cat $php_fpm_PID`
+		if ps -p $PID | grep -q $PID; then
+			echo "php-fpm (pid $PID) is running..."
+		else
+			echo "php-fpm dead but pid file exists"
+		fi
+	;;
+
 	force-quit)
 		echo -n "Terminating php-fpm "
 
@@ -131,7 +145,7 @@ case "$1" in
 	;;
 
 	*)
-		echo "Usage: $0 {start|stop|force-quit|restart|reload}"
+		echo "Usage: $0 {start|stop|force-quit|restart|reload|status}"
 		exit 1
 	;;
 
diff --git a/sapi/fpm/php-fpm.conf.in b/sapi/fpm/php-fpm.conf.in
index a63dec709..af4f2fa32 100644
--- a/sapi/fpm/php-fpm.conf.in
+++ b/sapi/fpm/php-fpm.conf.in
@@ -3,14 +3,14 @@
 ;;;;;;;;;;;;;;;;;;;;;
 
 ; All relative paths in this configuration file are relative to PHP's install
-; prefix (@prefix@). This prefix can be dynamicaly changed by using the
+; prefix (@prefix@). This prefix can be dynamically changed by using the
 ; '-p' argument from the command line.
 
 ; Include one or more files. If glob(3) exists, it is used to include a bunch of
 ; files from a glob(3) pattern. This directive can be used everywhere in the
 ; file.
 ; Relative path can also be used. They will be prefixed by:
-;  - the global prefix if it's been set (-p arguement)
+;  - the global prefix if it's been set (-p argument)
 ;  - @prefix@ otherwise
 ;include=etc/fpm.d/*.conf
 
@@ -105,7 +105,15 @@
 ; - /dev/poll  (Solaris >= 7)
 ; - port       (Solaris >= 10)
 ; Default Value: not set (auto detection)
-; events.mechanism = epoll
+;events.mechanism = epoll
+
+; When FPM is build with systemd integration, specify the interval,
+; in second, between health report notification to systemd.
+; Set to 0 to disable.
+; Available Units: s(econds), m(inutes), h(ours)
+; Default Unit: seconds
+; Default value: 10
+;systemd_interval = 10
 
 ;;;;;;;;;;;;;;;;;;;;
 ; Pool Definitions ; 
@@ -393,7 +401,7 @@ pm.max_spare_servers = 3
 ;      - %{megabytes}M
 ;      - %{mega}M
 ;  %n: pool name
-;  %o: ouput header
+;  %o: output header
 ;      it must be associated with embraces to specify the name of the header:
 ;      - %{Content-Type}o
 ;      - %{X-Powered-By}o
diff --git a/sapi/fpm/php-fpm.service.in b/sapi/fpm/php-fpm.service.in
index 396a88d66..a2df30e28 100644
--- a/sapi/fpm/php-fpm.service.in
+++ b/sapi/fpm/php-fpm.service.in
@@ -3,6 +3,7 @@ Description=The PHP FastCGI Process Manager
 After=syslog.target network.target
 
 [Service]
+Type=@php_fpm_systemd@
 PIDFile=@localstatedir@/run/php-fpm.pid
 ExecStart=@sbindir@/php-fpm --nodaemonize --fpm-config @sysconfdir@/php-fpm.conf
 ExecReload=/bin/kill -USR2 $MAINPID
diff --git a/sapi/isapi/stresstest/stresstest.cpp b/sapi/isapi/stresstest/stresstest.cpp
index 97824e6be..9a5964a6b 100644
--- a/sapi/isapi/stresstest/stresstest.cpp
+++ b/sapi/isapi/stresstest/stresstest.cpp
@@ -796,7 +796,7 @@ BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest,
 
 	switch(dwHSERequest) {
 		case (HSE_REQ_SEND_RESPONSE_HEADER) :
-			lpszRespBuf = (char *)xmalloc(*lpdwSize);//+ 80);//accomodate our header
+			lpszRespBuf = (char *)xmalloc(*lpdwSize);//+ 80);//accommodate our header
 			if (!lpszRespBuf)
 				return FALSE;
 			wsprintf(lpszRespBuf,"%s",
diff --git a/sapi/litespeed/README b/sapi/litespeed/README
index e548ec97d..b5cec05aa 100644
--- a/sapi/litespeed/README
+++ b/sapi/litespeed/README
@@ -195,7 +195,7 @@ process.
 
 By default a LSAPI application check the existence of its parent process
 and exits automatically if the parent process died. This is to reduce 
-orphan process when web server is restarted. However, it is desireable 
+orphan process when web server is restarted. However, it is desirable 
 to disable this feature, such as when a LSAPI process was started 
 manually from command line. LSAPI_PPID_NO_CHECK should be set when 
 you want to disable the checking of existence of parent process.
diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c
index 1a1baa707..548bcda17 100644
--- a/sapi/thttpd/thttpd.c
+++ b/sapi/thttpd/thttpd.c
@@ -579,7 +579,7 @@ static void queue_request(httpd_conn *hc)
 	m->next = NULL;
 	
 	tsrm_mutex_lock(qr_lock);
-	/* Create new threads when reaching a certain threshhold */
+	/* Create new threads when reaching a certain threshold */
 	if (nr_threads < max_threads && nr_free_threads < 2) {
 		nr_threads++; /* protected by qr_lock */
 		
diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag
index 00272b02b..7cd78faba 100644
--- a/scripts/Makefile.frag
+++ b/scripts/Makefile.frag
@@ -44,7 +44,7 @@ install-programs: $(builddir)/phpize $(builddir)/php-config
 		echo "  page: $(program_prefix)$${page}$(program_suffix).1"; \
 		$(INSTALL_DATA) $(builddir)/man1/$${page}.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)$${page}$(program_suffix).1; \
 	done
-	
+
 $(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status
 	(CONFIG_FILES=$@ CONFIG_HEADERS= $(top_builddir)/config.status)
 
diff --git a/scripts/dev/generate-phpt.phar b/scripts/dev/generate-phpt.phar
index d9e6ce430..c6268c0af 100644
--- a/scripts/dev/generate-phpt.phar
+++ b/scripts/dev/generate-phpt.phar
diff --git a/scripts/dev/generate-phpt/src/gtFunction.php b/scripts/dev/generate-phpt/src/gtFunction.php
index 74058216e..47f4bafcb 100644
--- a/scripts/dev/generate-phpt/src/gtFunction.php
+++ b/scripts/dev/generate-phpt/src/gtFunction.php
@@ -19,7 +19,7 @@ class gtFunction extends gtTestSubject {
 
 
   /**
-   * Get the names of function argments and initialise mandatory and optional argument arrays
+   * Get the names of function arguments and initialise mandatory and optional argument arrays
    *
    */
   public function setArgumentNames() {
diff --git a/scripts/dev/generate-phpt/src/testcase/gtTestCase.php b/scripts/dev/generate-phpt/src/testcase/gtTestCase.php
index cc5e19a5a..60c115a9c 100644
--- a/scripts/dev/generate-phpt/src/testcase/gtTestCase.php
+++ b/scripts/dev/generate-phpt/src/testcase/gtTestCase.php
@@ -104,7 +104,7 @@ abstract class gtTestCase {
 
 
   /**
-   * Add contructor argument initialisation to test case
+   * Add constructor argument initialisation to test case
    *
    */
   public function constructorArgInit() {
diff --git a/scripts/dev/generate-phpt/src/testcase/gtVariationContainerFunction.php b/scripts/dev/generate-phpt/src/testcase/gtVariationContainerFunction.php
index dfee4ea75..a62882a81 100644
--- a/scripts/dev/generate-phpt/src/testcase/gtVariationContainerFunction.php
+++ b/scripts/dev/generate-phpt/src/testcase/gtVariationContainerFunction.php
@@ -23,7 +23,7 @@ class gtVariationContainerFunction extends gtVariationContainer {
   
   
   /**
-   * Constucts all possible variation testcases in array $this->variationTests
+   * constructs all possible variation testcases in array $this->variationTests
    *
    */
   public function constructAll() {
diff --git a/scripts/phpize.in b/scripts/phpize.in
index 43cd8d30f..b86925e29 100644
--- a/scripts/phpize.in
+++ b/scripts/phpize.in
@@ -11,7 +11,7 @@ SED="@SED@"
 
 FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"
 FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
-CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \
+CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ modules/ install-sh \
 	mkinstalldirs missing config.nice config.sub config.guess configure configure.in \
 	aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache autom4te.cache/ \
 	config.log config.status Makefile Makefile.fragments Makefile.objects confdefs.h \
diff --git a/server-tests-config.php b/server-tests-config.php
index 47df90f5e..0ddff28cb 100755
--- a/server-tests-config.php
+++ b/server-tests-config.php
@@ -59,7 +59,7 @@ $conf = array(
 /* if true doesn't run tests, just outputs executable info */
 'TEST_CONTEXT_INFO'    =>    false,
 
-/* : or ; seperated list of paths */
+/* : or ; separated list of paths */
 'TEST_PATHS'           =>    NULL
 /* additional configuration items that may be set
    to provide proxy support for testes:
diff --git a/server-tests.php b/server-tests.php
index 051a1cfa0..684e111c9 100755
--- a/server-tests.php
+++ b/server-tests.php
@@ -413,7 +413,7 @@ class testHarness {
 	public $xargs = array(
 		#arg         env var                value        default   description
 		'c' => array(''                    ,'file'       ,NULL    ,'configuration file, see server-tests-config.php for example'),
-		'd' => array('TEST_PATHS'          ,'paths'      ,NULL    ,'colon seperate path list'),
+		'd' => array('TEST_PATHS'          ,'paths'      ,NULL    ,'colon separate path list'),
 		'e' => array('TEST_PHP_ERROR_STYLE','EMACS|MSVC' ,'EMACS' ,'editor error style'),
 		'h' => array(''                    ,''           ,NULL    ,'this help'),
 		'i' => array('PHPRC'               ,'path|file'  ,NULL    ,'ini file to use for tests (sets PHPRC)'),
diff --git a/tests/basic/bug45986.phpt b/tests/basic/bug45986.phpt
index 1c30f1040..33c3f27ea 100644
--- a/tests/basic/bug45986.phpt
+++ b/tests/basic/bug45986.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #45986 (wrong error message for a non existant file on rename)
+Bug #45986 (wrong error message for a non existent file on rename)
 --CREDITS--
 Sebastian Schürmann
 sebs@php.net
diff --git a/tests/classes/array_conversion_keys.phpt b/tests/classes/array_conversion_keys.phpt
new file mode 100644
index 000000000..e3bd7e033
--- /dev/null
+++ b/tests/classes/array_conversion_keys.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Verifies the correct conversion of objects to arrays
+--FILE--
+<?php
+class foo
+{
+	private $private = 'private';
+	protected $protected = 'protected';
+	public $public = 'public';
+}
+var_export((array) new foo);
+?>
+--EXPECTF--
+array (
+  '' . "\0" . 'foo' . "\0" . 'private' => 'private',
+  '' . "\0" . '*' . "\0" . 'protected' => 'protected',
+  'public' => 'public',
+)
diff --git a/tests/classes/private_members_serialization.phpt b/tests/classes/private_members_serialization.phpt
new file mode 100644
index 000000000..c8dd3ab24
--- /dev/null
+++ b/tests/classes/private_members_serialization.phpt
@@ -0,0 +1,23 @@
+--TEST--
+Verifies that it is possible to return private member names of parent classes in __sleep
+--FILE--
+<?php
+class foo
+{
+	private $private = 'private';
+	protected $protected = 'protected';
+	public $public = 'public';
+}
+
+class bar extends foo
+{
+	public function __sleep()
+	{
+		return array("\0foo\0private", 'protected', 'public');
+	}
+}
+
+var_dump(str_replace("\0", '\0', serialize(new bar())));
+?>
+--EXPECTF--
+string(114) "O:3:"bar":3:{s:12:"\0foo\0private";s:7:"private";s:12:"\0*\0protected";s:9:"protected";s:6:"public";s:6:"public";}"
diff --git a/tests/classes/static_properties_004.phpt b/tests/classes/static_properties_004.phpt
index ce1d19dcc..e98c605eb 100644
--- a/tests/classes/static_properties_004.phpt
+++ b/tests/classes/static_properties_004.phpt
@@ -6,7 +6,7 @@ class C { public static $p = 'original'; }
 class D extends C {	}
 class E extends D {	}
 
-echo "\nInherited static properties refer to the same value accross classes:\n";
+echo "\nInherited static properties refer to the same value across classes:\n";
 var_dump(C::$p, D::$p, E::$p);
 
 echo "\nChanging one changes all the others:\n";
@@ -20,7 +20,7 @@ var_dump(C::$p, D::$p, E::$p);
 ?>
 ==Done==
 --EXPECTF--
-Inherited static properties refer to the same value accross classes:
+Inherited static properties refer to the same value across classes:
 %unicode|string%(8) "original"
 %unicode|string%(8) "original"
 %unicode|string%(8) "original"
diff --git a/tests/output/bug60322.phpt b/tests/output/bug60322.phpt
index c28ab4d61..f4d713945 100644
--- a/tests/output/bug60322.phpt
+++ b/tests/output/bug60322.phpt
@@ -1,8 +1,11 @@
 --TEST--
 Bug #60322 (ob_get_clean() now raises an E_NOTICE if no buffers exist)
+--INI--
+output_buffering=128
 --FILE--
 <?php
-while(ob_get_clean()) ;
+ob_start();
+while(@ob_end_clean());
 var_dump(ob_get_clean());
 --EXPECT--
 bool(false)
diff --git a/win32/build/libs_version.txt b/win32/build/libs_version.txt
index 897d77b0b..ddbd92593 100644
--- a/win32/build/libs_version.txt
+++ b/win32/build/libs_version.txt
@@ -1,6 +1,6 @@
 bz2-1.0.6
 cclient-2007e
-freetype-2.4.3
+freetype-2.4.10
 icu-49.1.2
 jpeglib-8
 libcurl-7.30.0
diff --git a/win32/glob.c b/win32/glob.c
index a197f3bbe..1aeac78fd 100644
--- a/win32/glob.c
+++ b/win32/glob.c
@@ -689,7 +689,7 @@ glob3(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last,
 
 
 /*
- * Extend the gl_pathv member of a glob_t structure to accomodate a new item,
+ * Extend the gl_pathv member of a glob_t structure to accommodate a new item,
  * add the new item, and update gl_pathc.
  *
  * This assumes the BSD realloc, which only copies the block when its size
diff --git a/win32/install.txt b/win32/install.txt
index b1d4ee514..2883dd37f 100644
--- a/win32/install.txt
+++ b/win32/install.txt
@@ -355,7 +355,7 @@ c:\php
    packages have the server modules in the sapi folder, PHP 5
    distributions have no such directory and instead they're in the PHP
    folder root. The supporting DLLs for the PHP 5 extensions are also not
-   in a seperate directory.
+   in a separate directory.
 
      Note: In PHP 4, you should move all files located in the dll and
      sapi folders to the main folder (e.g. C:\php).
diff --git a/win32/sendmail.c b/win32/sendmail.c
index c4969ad5e..f541016f5 100644
--- a/win32/sendmail.c
+++ b/win32/sendmail.c
@@ -118,8 +118,8 @@ static char *ErrorMessages[] =
 	{"Error while trimming mail header with PCRE, please file a bug report at http://bugs.php.net/"} /* 21 */
 };
 
-/* This pattern converts all single occurences of \n (Unix)
- * withour a leading \r to \r\n and all occurences of \r (Mac)
+/* This pattern converts all single occurrences of \n (Unix)
+ * withour a leading \r to \r\n and all occurrences of \r (Mac)
  * without a trailing \n to \r\n
  * Thx to Nibbler from ircnet/#linuxger
  */
@@ -129,7 +129,7 @@ static char *ErrorMessages[] =
 /* This pattern removes \r\n from the start of the string,
  * \r\n from the end of the string and also makes sure every line
  * is only wrapped with a single \r\n (thus reduces multiple
- * occurences of \r\n between lines to a single \r\n) */
+ * occurrences of \r\n between lines to a single \r\n) */
 #define PHP_WIN32_MAIL_RMVDBL_PATTERN	"/^\r\n|(\r\n)+$/m"
 #define PHP_WIN32_MAIL_RMVDBL_REPLACE	""
 
@@ -141,11 +141,11 @@ static char *ErrorMessages[] =
 #define PHP_WIN32_MAIL_DOT_REPLACE	"\n.."
 
 /* This function is meant to unify the headers passed to to mail()
- * This means, use PCRE to transform single occurences of \n or \r in \r\n
- * As a second step we also eleminate all \r\n occurences which are:
+ * This means, use PCRE to transform single occurrences of \n or \r in \r\n
+ * As a second step we also eleminate all \r\n occurrences which are:
  * 1) At the start of the header
  * 2) At the end of the header
- * 3) Two or more occurences in the header are removed so only one is left
+ * 3) Two or more occurrences in the header are removed so only one is left
  *
  * Returns NULL on error, or the new char* buffer on success.
  * You have to take care and efree() the buffer on your own.
@@ -408,7 +408,7 @@ static int SendText(char *RPath, char *Subject, char *mailTo, char *mailCc, char
 
 	snprintf(Buffer, sizeof(Buffer), "HELO %s\r\n", LocalHost);
 
-	/* in the beggining of the dialog */
+	/* in the beginning of the dialog */
 	/* attempt reconnect if the first Post fail */
 	if ((res = Post(Buffer)) != SUCCESS) {
 		MailConnect();
diff --git a/win32/signal.h b/win32/signal.h
index de43f98e8..df60dfb72 100644
--- a/win32/signal.h
+++ b/win32/signal.h
@@ -2,7 +2,7 @@
 ** Change here: if you plan to use your own version of <signal.h>
 ** the original "#include <signal.h>" produces an infinite reinclusion
 ** of this file, instead of including the standard include-file.
-** Under MS Visual Studio, there are occurences in the source where
+** Under MS Visual Studio, there are occurrences in the source where
 ** <signal.h> gets included throughout the PHP sources, and this should
 ** include THIS file, not the standard one which does not have the
 ** additional signals defined below.